|
|
@@ -29,11 +29,11 @@
|
|
|
%define V_cvs2cl 2.38
|
|
|
|
|
|
# optional support for applying the RSE patches
|
|
|
-%ifndef rse_patches
|
|
|
-%define rse_patches no
|
|
|
+%ifndef with_rse_patches
|
|
|
+%define with_rse_patches no
|
|
|
%endif
|
|
|
-%ifndef rse_patch_cvsuser_caller
|
|
|
-%define rse_patch_cvsuser_caller cvs
|
|
|
+%ifndef with_rse_patch_cvsuser_caller
|
|
|
+%define with_rse_patch_cvsuser_caller cvs
|
|
|
%endif
|
|
|
|
|
|
# package information
|
|
|
@@ -46,7 +46,7 @@ Distribution: OpenPKG [REL]
|
|
|
Group: CVS
|
|
|
License: GPL
|
|
|
Version: %{V_cvs}
|
|
|
-Release: 20020312
|
|
|
+Release: 20020328
|
|
|
|
|
|
# list of sources
|
|
|
Source0: http://www.cvshome.org/files/19/10/cvs-%{V_cvs}.tar.gz
|
|
|
@@ -81,7 +81,7 @@ AutoReqProv: no
|
|
|
(a tool for assembling a GNU ChangeLog file from "cvs log" output)
|
|
|
and cvslock (an administration tool for manually locking a CVS
|
|
|
repository area).
|
|
|
-%if "%{rse_patches}" == "yes"
|
|
|
+%if "%{with_rse_patches}" == "yes"
|
|
|
This version of CVS has the large set of patches applied from
|
|
|
Ralf S. Engelschall <rse@engelschall.com> (-DRSE_PATCHES). This
|
|
|
means that (still undocumented) extra functionality is available.
|
|
|
@@ -93,10 +93,10 @@ AutoReqProv: no
|
|
|
( cd cvs-%{V_cvs}/zlib
|
|
|
%patch0 -p1
|
|
|
)
|
|
|
-%if "%{rse_patches}" == "yes"
|
|
|
+%if "%{with_rse_patches}" == "yes"
|
|
|
( cd cvs-%{V_cvs}
|
|
|
cat %{SOURCE cvs.patches.rse} |\
|
|
|
- sed -e 's;\(#define RSE_PATCH_CVSUSER_CALLER "\)cvs\("\);\1%{rse_patch_cvsuser_caller}\2;' |\
|
|
|
+ sed -e 's;\(#define RSE_PATCH_CVSUSER_CALLER "\)cvs\("\);\1%{with_rse_patch_cvsuser_caller}\2;' |\
|
|
|
%{l_prefix}/bin/patch -p0
|
|
|
)
|
|
|
%endif
|
|
|
@@ -104,7 +104,7 @@ AutoReqProv: no
|
|
|
%build
|
|
|
( cd cvs-%{V_cvs}
|
|
|
CC="%{l_cc}" \
|
|
|
-%if "%{rse_patches}" == "yes"
|
|
|
+%if "%{with_rse_patches}" == "yes"
|
|
|
CFLAGS="%{l_cflags -O} -DRSE_PATCHES" \
|
|
|
%else
|
|
|
CFLAGS="%{l_cflags -O}" \
|
|
|
@@ -142,7 +142,7 @@ AutoReqProv: no
|
|
|
%{l_shtool} install -c -m 755 \
|
|
|
%{SOURCE cvs2cl.pl} $RPM_BUILD_ROOT%{l_prefix}/bin/cvs2cl
|
|
|
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
|
|
|
-%if "%{rse_patches}" == "yes"
|
|
|
+%if "%{with_rse_patches}" == "yes"
|
|
|
%{l_shtool} mkdir -f -p -m 755 \
|
|
|
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
|
|
|
$RPM_BUILD_ROOT%{l_prefix}/var/cvs
|