|
|
@@ -23,7 +23,7 @@
|
|
|
## SUCH DAMAGE.
|
|
|
##
|
|
|
|
|
|
-%define V_cvs 1.11.0.1
|
|
|
+%define V_cvs 1.11.1p1
|
|
|
%define V_cvslock 0.2
|
|
|
%define V_cvs2cl 2.38
|
|
|
|
|
|
@@ -40,7 +40,7 @@ Version: %{V_cvs}
|
|
|
Release: 20011201.0
|
|
|
|
|
|
# list of sources
|
|
|
-Source0: ftp://ftp.ossp.org/pkg/ossp-cvs/ossp-cvs-%{V_cvs}.tar.gz
|
|
|
+Source0: http://www.cvshome.org/files/19/10/cvs-%{V_cvs}.tar.gz
|
|
|
Source1: ftp://riemann.iam.uni-bonn.de/pub/users/roessler/cvslock/cvslock-%{V_cvslock}.tar.gz
|
|
|
Source2: http://www.red-bean.com/cvs2cl/cvs2cl.pl
|
|
|
|
|
|
@@ -65,10 +65,8 @@ AutoReqProv: no
|
|
|
area network. CVS keeps a single copy of the master sources. This
|
|
|
copy is called the source repository.
|
|
|
|
|
|
- This is the OSSP version of CVS, which provides many new features
|
|
|
- and adjustments. Additionally the following popular CVS tools are
|
|
|
- included: cvsweb (a CGI for browsing a CVS repository), cvs2cl (a
|
|
|
- tool for assembling a GNU ChangeLog file from "cvs log" output)
|
|
|
+ Additionally the following popular CVS tools are included: cvs2cl
|
|
|
+ (a tool for assembling a GNU ChangeLog file from "cvs log" output)
|
|
|
and cvslock (an administration tool for manually locking a CVS
|
|
|
repository area).
|
|
|
|
|
|
@@ -77,10 +75,7 @@ AutoReqProv: no
|
|
|
%setup1 -q -T -D -a 1
|
|
|
|
|
|
%build
|
|
|
- ( cd ossp-cvs-%{V_cvs}
|
|
|
- %{l_rpmtool} subst \
|
|
|
- 's;^\(#define OSSP_PATCH_CVSUSER_CALLER "\)[^"]*\("\);\1cvs\2;' \
|
|
|
- -- src/subr.c
|
|
|
+ ( cd cvs-%{V_cvs}
|
|
|
CC="%{l_cc}" \
|
|
|
CFLAGS="%{l_cflags -O}" \
|
|
|
./configure \
|
|
|
@@ -102,11 +97,16 @@ AutoReqProv: no
|
|
|
|
|
|
%install
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
- ( cd ossp-cvs-%{V_cvs}
|
|
|
- %{l_make} %{l_mflags} install prefix=$RPM_BUILD_ROOT%{l_prefix}
|
|
|
+ ( cd cvs-%{V_cvs}
|
|
|
+ %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
|
|
|
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/rcs2log
|
|
|
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
|
|
|
+ mv $RPM_BUILD_ROOT%{l_prefix}/share/cvs/contrib/* \
|
|
|
+ $RPM_BUILD_ROOT%{l_prefix}/share/cvs/
|
|
|
+ rmdir $RPM_BUILD_ROOT%{l_prefix}/share/cvs/contrib
|
|
|
)
|
|
|
( cd cvslock-%{V_cvslock}
|
|
|
- %{l_make} %{l_mflags} install prefix=$RPM_BUILD_ROOT%{l_prefix}
|
|
|
+ %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
|
|
|
)
|
|
|
%{l_shtool} install -c -m 755 \
|
|
|
%{SOURCE cvs2cl.pl} $RPM_BUILD_ROOT%{l_prefix}/bin/cvs2cl
|
