[cvs] Split contributed scripts

[Petr Pisar]

commit 0be5d30f9de2b6cb0485d845dc4c2d7f15c60bd5
Author: Petr Písař <ppisar at redhat.com>
Date:   Thu May 26 14:12:53 2011 +0200

    Split contributed scripts
    
    They require Perl and csh (reenabled).

 cvs.spec |   31 ++++++++++++++++++++++++-------
 1 files changed, 24 insertions(+), 7 deletions(-)
---
diff --git a/cvs.spec b/cvs.spec
index bed5ef7..a7fd417 100644
--- a/cvs.spec
+++ b/cvs.spec
@@ -5,7 +5,7 @@
 
 Name: cvs
 Version: 1.11.23
-Release: 18%{?dist}
+Release: 19%{?dist}
 Summary: Concurrent Versions System
 Group: Development/Tools
 URL: http://cvs.nongnu.org/
@@ -58,10 +58,6 @@ Patch24: cvs-1.11.23-make_make_check_sanity_testing_verbose.patch
 Patch25: cvs-1.11.23-Set-PAM_TTY-and-PAM_RHOST-on-PAM-authentication.patch
 Patch26: cvs-1.11.23-Back-port-KeywordExpand-configuration-keyword.patch
 
-# Don't let find provides to add csh to automatic requires
-%filter_requires_in ^%{buildroot}%{_datadir}/%{name}/contrib/sccs2rcs$
-%filter_setup
-
 %description
 CVS (Concurrent Versions System) is a version control system that can
 record the history of your files (usually, but not always, source
@@ -78,6 +74,19 @@ directories and files can then be combined together to form a software
 release.
 
 
+%package contrib
+Summary: Unsupported contributions collected by CVS developers
+Group: Development/Tools
+# check_cvs is Copyright only
+License: GPLv2+ and Copyright only
+BuildArch: noarch
+Requires: %{name} = %{version}-%{release}
+
+%description contrib
+Scripts sent to CVS developers by contributors around the world. These
+contributions are really unsupported.
+
+
 %package inetd
 Summary: CVS server configuration for xinetd
 Group: Development/Tools
@@ -199,16 +208,20 @@ exit 0
 %defattr(-,root,root)
 %doc AUTHORS BUGS COPYING* DEVEL-CVS HACKING MINOR-BUGS NEWS
 %doc PROJECTS TODO README
-%{_bindir}/*
+%{_bindir}/cvs*
 %{_mandir}/*/*
 %{_infodir}/*.info*
-%{_datadir}/%{name}
 %dir %{_localstatedir}/%{name}
 %if %{pamified}
 %config(noreplace) %{_sysconfdir}/pam.d/*
 %endif
 %config(noreplace) %{_sysconfdir}/profile.d/*
 
+%files contrib
+%defattr(-,root,root)
+%{_bindir}/rcs2log
+%{_datadir}/%{name}
+
 %files inetd
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
@@ -220,6 +233,10 @@ exit 0
 
 
 %changelog
+* Thu May 26 2011 Petr Pisar <ppisar at redhat.com> - 1.11.23-19
+- Split contributed scripts (including rcs2log) to separate `contrib'
+  sub-package due to dependencies
+
 * Thu May 26 2011 Petr Pisar <ppisar at redhat.com> - 1.11.23-18
 - Filter sccs2rcs interpreter from dependencies again (bug #225672)