[cvs] Fix issues found by package review

Petr Pisar ppisar at fedoraproject.org
Mon Oct 25 15:55:21 UTC 2010 

commit 396216b7b90a0205f997eb0e9d063406946d7321
Author: Petr Písař <ppisar at redhat.com>
Date:   Mon Oct 25 17:52:54 2010 +0200

    Fix issues found by package review
    
    Remove unused patches
    Fix license tag
    Fix home page URL
    Improve summary
    Package additional documentation
    Move FAQ file into `doc' subpackage
    Remove undefined date in cvs(1)
    Make contrib script executable again
    
    Adjust sanity tests to accept new style getopt argument quotation and
    SELinux label notation from ls(1)

 cvs-1.11.22-diff-rm.patch |   18 ---------
 cvs-1.11.22-free.patch    |   11 ------
 cvs.spec                  |   88 +++++++++++++++++++++++++++++++-------------
 3 files changed, 62 insertions(+), 55 deletions(-)
---
diff --git a/cvs.spec b/cvs.spec
index ccc361b..7a13874 100644
--- a/cvs.spec
+++ b/cvs.spec
@@ -3,23 +3,27 @@
 # Use kerberos
 %define kerberized 1  
 
-Summary: A version control system
 Name: cvs
 Version: 1.11.23
-Release: 11%{?dist}
-License: GPL+ and GPLv2+ and LGPL+
+Release: 12%{?dist}
+Summary: Concurrent Versions System
 Group: Development/Tools
+URL: http://cvs.nongnu.org/
+# Source files in zlib/ directory are licensed under zlib/libpng
+# Other files are mostly GPL+, some of them are GPLv2+ or
+# LGPLv2+ and there is vms/pathnames.h BSD licensed
+License: BSD and GPL+ and GPLv2+ and LGPLv2+ and zlib
 Source0: ftp://ftp.gnu.org/non-gnu/cvs/source/stable/%{version}/cvs-%{version}.tar.bz2
 Source1: cvs.xinetd
 Source2: cvs.pam
 Source3: cvs.sh
 Source4: cvs.csh
-URL: http://www.cvshome.org/
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Requires: vim-minimal
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: autoconf >= 2.58, automake >= 1.7.9, libtool, zlib-devel, vim-minimal
+BuildRequires: autoconf >= 2.58, automake >= 1.7.9, libtool, zlib-devel
+BuildRequires: vim-minimal
 %if %{kerberized}
 BuildRequires: krb5-devel
 %endif
@@ -41,14 +45,18 @@ Patch12: cvs-1.11.21-pam.patch
 Patch13: cvs-1.11.21-diff.patch
 Patch14: cvs-1.11.21-diff-kk.patch
 Patch15: cvs-1.11.21-sort.patch
-#Patch16: cvs-1.11.22-free.patch //unneeded
 Patch17: cvs-1.11.22-ipv6-proxy.patch
-#Patch18: cvs-1.11.22-diff-rm.patch
 Patch19: cvs-1.11.23-getline64.patch
 Patch20: cvs-1.11.22-stdinargs.patch
 # CVE-2010-3864, bug #645386
 Patch21: cvs-1.11.23-cve-2010-3846.patch
+Patch22: cvs-1.11.23-remove_undefined_date_from_cvs_1_header.patch
+Patch23: cvs-1.11.23-sanity.patch
+Patch24: cvs-1.11.23-make_make_check_sanity_testing_verbose.patch
 
+# Don't let find provides to add csh to automatic requires
+%filter_requires_in ^%{_datadir}/%{name}/contrib/sccs2rcs$
+%filter_setup
 
 %description
 CVS (Concurrent Versions System) is a version control system that can
@@ -65,6 +73,18 @@ of directories consisting of revision controlled files. These
 directories and files can then be combined together to form a software
 release.
 
+
+%package doc
+Summary: Additional documentation for Concurrent Versions System
+Group: Documentation
+License: GPL+
+BuildArch: noarch
+
+%description doc
+FAQ, RCS format description, parallel development how-to, and Texinfo
+pages in PDF.
+
+
 %prep
 %setup -q
 %patch0 -p1 -b .cvspass
@@ -85,12 +105,13 @@ release.
 %patch13 -p1 -b .diff
 %patch14 -p1 -b .diff-kk
 %patch15 -p1 -b .env
-#%patch16 -p1 -b .free
 %patch17 -p1 -b .ipv6
-#%patch18 -p1 -b .diff-rm
 %patch19 -p1 -b getline64
 %patch20 -p1 -b .stdinargs
 %patch21 -p1 -b .cve-2010-3846
+%patch22 -p1 -b .undefined_date
+%patch23 -p1 -b .sanity
+%patch24 -p1 -b .verbose_sanity
 
 # Apply a patch to the generated files, OR
 # run autoreconf and require autoconf >= 2.58, automake >= 1.7.9
@@ -99,11 +120,10 @@ touch -r FAQ FAQ.UTF8
 mv FAQ.UTF8 FAQ
 
 %build
-
 autoreconf
 
 %if %{pamified} 
-PAM_CONFIG="--enable-pam"
+    PAM_CONFIG="--enable-pam"
 %endif
 
 %if %{kerberized}
@@ -114,10 +134,10 @@ PAM_CONFIG="--enable-pam"
 	KRB_CONFIG="--with-gssapi --without-krb4 --enable-encryption"
 %endif
 
-%configure CFLAGS="$CFLAGS $RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE" \
-  $PAM_CONFIG $KRB_CONFIG CSH=/bin/csh
+%configure CFLAGS="$CFLAGS $RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 %-D_LARGEFILE64_SOURCE" \
+    $PAM_CONFIG $KRB_CONFIG CSH=/bin/csh
 
-make
+make %{?_smp_mflags}
 
 %check
 if [ `id -u` -ne 0 ] ; then
@@ -125,12 +145,13 @@ if [ `id -u` -ne 0 ] ; then
 fi
 
 %install
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-make DESTDIR="$RPM_BUILD_ROOT" install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR="$RPM_BUILD_ROOT" INSTALL="install -p"
 # forcefully compress the info pages so that install-info will work properly
 # in the %%post
 gzip $RPM_BUILD_ROOT/%{_infodir}/cvs* || true
 rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
+
 install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/%{name}
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/%{name}
 %if %{pamified}
@@ -138,28 +159,27 @@ install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/cvs
 %endif
 install -D -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/cvs.sh
 install -D -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/cvs.csh
-# Don't let find provides to add csh to automatic requires
-chmod a-x $RPM_BUILD_ROOT/%{_datadir}/%{name}/contrib/sccs2rcs
 
 
 %clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/install-info /%{_infodir}/cvs.info.gz /%{_infodir}/dir &> /dev/null
-/sbin/install-info /%{_infodir}/cvsclient.info.gz /%{_infodir}/dir &> /dev/null
-:
+/sbin/install-info /%{_infodir}/cvs.info.gz /%{_infodir}/dir
+/sbin/install-info /%{_infodir}/cvsclient.info.gz /%{_infodir}/dir
+exit 0
 
 %preun
 if [ $1 = 0 ]; then
-	/sbin/install-info --delete /%{_infodir}/cvs.info.gz /%{_infodir}/dir &> /dev/null
-	/sbin/install-info --delete /%{_infodir}/cvsclient.info.gz /%{_infodir}/dir &> /dev/null
+	/sbin/install-info --delete /%{_infodir}/cvs.info.gz /%{_infodir}/dir
+	/sbin/install-info --delete /%{_infodir}/cvsclient.info.gz /%{_infodir}/dir
 fi
-:
+exit 0
+
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS BUGS COPYING* DEVEL-CVS FAQ HACKING MINOR-BUGS NEWS
+%doc AUTHORS BUGS COPYING* DEVEL-CVS HACKING MINOR-BUGS NEWS
 %doc PROJECTS TODO README
 %{_bindir}/*
 %{_mandir}/*/*
@@ -167,10 +187,26 @@ fi
 %{_datadir}/%{name}
 %config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
 %dir %{_localstatedir}/%{name}
+%if %{pamified}
 %config(noreplace) %{_sysconfdir}/pam.d/*
+%endif
 %config(noreplace) %{_sysconfdir}/profile.d/*
 
+%files doc
+%defattr(-,root,root)
+%doc FAQ doc/RCSFILES doc/*.pdf
+%doc COPYING
+
+
 %changelog
+* Mon Oct 25 2010 Petr Pisar <ppisar at redhat.com> - 1.11.23-12
+- Adjust spec file to package review: remove unused patches, fix license tag,
+  fix home page URL, improve summary, package additional documentation, move
+  FAQ file into `doc' subpackage, remove undefined date in cvs(1), make
+  contrib script executable again (bug #225672)
+- Adjust sanity tests to accept new style getopt argument quotation and
+  SELinux label notation from ls(1)
+
 * Thu Oct 21 2010 Petr Pisar <ppisar at redhat.com> - 1.11.23-11
 - Fix CVE-2010-3846 (bug #645386)

More information about the scm-commits mailing list