orig rh72

  ftp://ftp.fi.muni.cz/pub/linux/redhat/linux/current/en/os/i386/SRPMS/cvs-1.11.1p1-3.src.rpm

diff --git a/src/rpm/SPECS/cvs.spec b/src/rpm/SPECS/cvs.spec
index d6cee6d..d177d10 100644 (file)
--- a/src/rpm/SPECS/cvs.spec
+++ b/src/rpm/SPECS/cvs.spec
@@ -1,74 +1,72 @@
-%define nokerberos 1
+%define cvsbase  1.11.1
+%define cvspatch p1
 Summary: A version control system.
 Name: cvs
-Version: 1.11
-Release: 3_nokerberos_static_badroot
-Copyright: GPL
+Version: %{cvsbase}%{cvspatch}
+Release: 3
+License: GPL
 Group: Development/Tools
-Source: ftp://ftp.cvshome.org/pub/cvs-%{version}/cvs-%{version}.tar.gz
+Source: ftp://ftp.cvshome.org/pub/cvs-%{cvsbase}/cvs-%{version}.tar.gz
 URL: http://www.cvshome.org/
-Patch0: cvs-1.10-tmprace.patch
-Patch1: cvs-1.10.7-fixinfo.patch
-Patch2: cvs-1.10.7-krb5-1.1.1.patch
-Patch3: cvs-1.10.8-krb4.patch
-Patch4: cvs-1.10.8-zlib.patch
-Patch6: cvs-1.10.8-errno.patch
-Patch7: cvs-1.11-security.patch
-Patch8: cvs-1.11-existence.patch
-Patch100: cvs-1.11-umask022.patch
-Patch101: cvs-1.11-badroot.patch
+Patch0: cvs-1.11.1p1-mktemp.patch
+Patch1: cvs-1.11.1p1-krb4.patch
+Patch2: cvs-1.11.1p1-automake.patch
+Patch3: cvs-1.11.1p1-sockaddr.patch
+Patch4: cvs-1.11.1p1-authserver.patch
+Patch5: cvs-1.11.1p1-cvspass.patch
+Patch6: cvs-1.11.1p1-bs.patch
 Prereq: /sbin/install-info
 Prefix: %{_prefix}
 Buildroot: %{_tmppath}/%{name}-root
-Requires: perl zlib
-BuildPreReq: autoconf libtool zlib-devel
+BuildPreReq: autoconf, automake, libtool, zlib-devel
 %{!?nokerberos:Requires: krb5-libs}
 %{!?nokerberos:BuildPrereq: krb5-devel}
 
 %description
-CVS (Concurrent Version System) is a version control system which can
+CVS (Concurrent Version System) is a version control system that can
 record the history of your files (usually, but not always, source
 code). CVS only stores the differences between versions, instead of
-every version of every file you've ever created. CVS also keeps a log
-of who, when and why changes occurred.
+every version of every file you have ever created. CVS also keeps a log
+of who, when, and why changes occurred.
 
 CVS is very helpful for managing releases and controlling the
 concurrent editing of source files among multiple authors. Instead of
 providing version control for a collection of files in a single
 directory, CVS provides version control for a hierarchical collection
-of directories consisting of revision controlled files.  These
+of directories consisting of revision controlled files. These
 directories and files can then be combined together to form a software
 release.
 
-Install the cvs package if you need to use a version control system.
-
 %prep
 %setup -q
-%patch0 -p1 -b .tmprace
-%patch1 -p1 -b .fixinfo
-%{!?nokerberos:%patch2 -p1 -b .krb5}
-%{!?nokerberos:%patch3 -p1 -b .krb4}
-%patch4 -p1 -b .zlib
-%patch6 -p1 -b .errno
-%patch7 -p1 -b .security
-%patch8 -p1 -b .existence
-%patch100 -p1 -b .umask022
-%patch101 -p1 -b .badroot
+%patch0 -p1 -b .mktemp
+%patch1 -p1 -b .krb4
+%patch2 -p1 -b .automake
+%patch3 -p1 -b .sockaddr
+%patch4 -p1 -b .authserver
+%patch5 -p1 -b .cvspass
+%patch6 -p1 -b .bs
+aclocal
+automake
+autoconf
 
 %build
-autoheader
-autoconf
-export LDFLAGS="-s -static -L$HOME/staticnss -lc -lnss_files -lnss_dns -lresolv"
+%{!?nokerberos: CPPFLAGS="-I/usr/kerberos/include"; export CPPFLAGS}
+%{!?nokerberos: CFLAGS="-I/usr/kerberos/include $RPM_OPT_FLAGS"; export CFLAGS}
+%{!?nokerberos: LIBS="-L/usr/kerberos/lib -lkrb4 -ldes425 -lk5crypto -lcom_err"; export LIBS}
 %configure \
 %{!?nokerberos: --with-gssapi=/usr/kerberos --with-krb4=/usr/kerberos --enable-encryption}
 
 make
-make -C doc info
+if [ `id -u` -ne 0 ] ; then
+       make check
+fi
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
-%{makeinstall} install-info
+%{makeinstall}
+# forcefully compress the info pages so that install-info will work properly
+# in the %%post
 gzip $RPM_BUILD_ROOT/%{_infodir}/cvs* || true
 
 %clean
@@ -86,18 +84,33 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc BUGS FAQ MINOR-BUGS NEWS PROJECTS TODO README
+%doc AUTHORS BUGS FAQ MINOR-BUGS NEWS PROJECTS TODO README
 %doc doc/*.ps
-/%{_bindir}/cvs
-/%{_bindir}/cvsbug
-/%{_bindir}/rcs2log
-/%{_mandir}/man1/cvs.1*
-/%{_mandir}/man5/cvs.5*
-/%{_mandir}/man8/cvsbug.8*
-/%{_infodir}/cvs*
-/%{_libdir}/cvs
+%{_bindir}/*
+%{_mandir}/*/*
+%{_infodir}/*.info*
+%{_datadir}/%{name}
 
 %changelog
+* Tue Jul 31 2001 Bernhard Rosenkraenzer <bero@redhat.com> 1.11.1p1-3
+- Fix up initial cvs login (#47457)
+- Bring back the leading newline at the beginning of commit messages
+  "a" is one key less than "O". ;)
+- Fix build in the current build system
+
+* Mon Jun 25 2001 Bill Nottingham <notting@redhat.com>
+- don't own /usr/share/info/dir
+
+* Fri Jun 22 2001 Nalin Dahyabhai <nalin@redhat.com>
+- fix the files list
+
+* Mon Jun 18 2001 Nalin Dahyabhai <nalin@redhat.com>
+- update to 1.11.1p1
+- drop no-longer-necessary patches
+- use bundled zlib, because it's apparently not the same as the system zlib
+- run the test suite in the build phase
+- drop explicit Requires: on perl (RPM will catch the interpreter req)
+
 * Mon Jan 29 2001 Nalin Dahyabhai <nalin@redhat.com>
 - fix cvs-1.11-security.patch, which had CR-LF line terminators (#25090)
 - check for and ignore ENOENT errors when attempting to remove symlinks (#25173)