RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 18-Jun-2007 21:04:09
Branch: HEAD Handle: 2007061820040900
Modified files:
rpm rpm.spec.in
Log:
add a rpm-common subpkg to carry conflicting elements.
Summary:
Revision Changes Path
2.442 +56 -45 rpm/rpm.spec.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/rpm.spec.in
============================================================================
$ cvs diff -u -r2.441 -r2.442 rpm.spec.in
--- rpm/rpm.spec.in 18 Jun 2007 00:03:03 -0000 2.441
+++ rpm/rpm.spec.in 18 Jun 2007 19:04:09 -0000 2.442
@@ -87,6 +87,14 @@
This package should be installed if you want to develop programs that
will manipulate RPM packages and databases.
+%package common
+Summary: Common RPM paths, scripts, documentation and configuration.
+Group: Development/Tools
+
+%description common
+The rpm-common package contains paths, scripts, documentation
+and configuration common between RPM Package Manager.
+
%package build
Summary: Scripts and executable programs used to build packages.
Group: Development/Tools
@@ -262,32 +270,41 @@
%endif
-%files -f rpm.lang
-%doc CHANGES GROUPS doc/manual/[a-z]*
-%pubkey pubkeys/JBJ-GPG-KEY
-
%ifos linux
%define rpmattr %attr(0755, @RPMUSER@, @RPMGROUP@)
%define rpmdbattr %attr(0644, @RPMUSER@, @RPMGROUP@) %verify(not md5
size mtime) %ghost %config(missingok,noreplace)
-
-%dir /etc/rpm
-%attr(0755, @RPMUSER@, @RPMGROUP@) %dir /var/lib/rpm
-%attr(0755, @RPMUSER@, @RPMGROUP@) %dir /var/spool/repackage
-
-%rpmdbattr /var/lib/rpm/*
%endif
+%files
+%pubkey pubkeys/JBJ-GPG-KEY
+
%rpmattr %{_bindir}/rpm
-%rpmattr %{_bindir}/rpm2cpio
-%rpmattr %{_bindir}/gendiff
-%attr(0755, @RPMUSER@, @RPMGROUP@) %dir %{_usrlibrpm}
%attr(0755, @RPMUSER@, @RPMGROUP@) %dir %{_rpmhome}
%attr(0644, @RPMUSER@, @RPMGROUP@) %{_rpmhome}/macros
%rpmattr %{_rpmhome}/rpm.*
%rpmattr %{_rpmhome}/tgpg
%attr(0644, @RPMUSER@, @RPMGROUP@) %{_rpmhome}/rpmpopt
+%rpmattr %{_rpmhome}/rpmdb_loadcvt
+%rpmattr %{_rpmhome}/db_*
+%rpmattr %{_rpmhome}/magic
+%rpmattr %{_rpmhome}/magic.mgc
+%rpmattr %{_rpmhome}/magic.mime
+%rpmattr %{_rpmhome}/magic.mime.mgc
+
+%files common -f rpm.lang
+%doc CHANGES GROUPS doc/manual/[a-z]*
+%rpmattr %{_bindir}/rpm2cpio
+%rpmattr %{_bindir}/gendiff
+%ifos linux
+%dir /etc/rpm
+%attr(0755, @RPMUSER@, @RPMGROUP@) %dir /var/lib/rpm
+%rpmdbattr /var/lib/rpm/*
+%attr(0755, @RPMUSER@, @RPMGROUP@) %dir /var/spool/repackage
+%endif
+
+%attr(0755, @RPMUSER@, @RPMGROUP@) %dir %{_usrlibrpm}
%ifarch i386 i486 i586 i686 athlon pentium3 pentium4
%attr(-, @RPMUSER@, @RPMGROUP@) %{_usrlibrpm}/i[3456]86*
%attr(-, @RPMUSER@, @RPMGROUP@) %{_usrlibrpm}/athlon*
@@ -322,12 +339,13 @@
%endif
%attr(-, @RPMUSER@, @RPMGROUP@) %{_usrlibrpm}/noarch*
-%rpmattr %{_rpmhome}/rpmdb_loadcvt
-%rpmattr %{_rpmhome}/db_*
-%rpmattr %{_rpmhome}/magic
-%rpmattr %{_rpmhome}/magic.mgc
-%rpmattr %{_rpmhome}/magic.mime
-%rpmattr %{_rpmhome}/magic.mime.mgc
+%dir %{__prefix}/src/rpm
+%dir %{__prefix}/src/rpm/BUILD
+%dir %{__prefix}/src/rpm/SPECS
+%dir %{__prefix}/src/rpm/SOURCES
+%dir %{__prefix}/src/rpm/SRPMS
+%dir %{__prefix}/src/rpm/RPMS
+%{__prefix}/src/rpm/RPMS/*
%{_mandir}/man8/rpm.8*
%{_mandir}/man8/rpm2cpio.8*
@@ -341,6 +359,25 @@
%lang(ru) %{_mandir}/ru/man8/rpm2cpio.8*
%lang(sk) %{_mandir}/sk/man8/rpm.8*
+%{_mandir}/man1/gendiff.1*
+%{_mandir}/man8/rpmbuild.8*
+%{_mandir}/man8/rpmdeps.8*
+#%lang(ja) %{_mandir}/ja/man1/gendiff.1*
+%lang(ja) %{_mandir}/ja/man8/rpmbuild.8*
+#%lang(ja) %{_mandir}/ja/man8/rpmdeps.8*
+#%lang(ko) %{_mandir}/ko/man1/gendiff.1*
+#%lang(ko) %{_mandir}/ko/man8/rpmbuild.8*
+#%lang(ko) %{_mandir}/ko/man8/rpmdeps.8*
+%lang(pl) %{_mandir}/pl/man1/gendiff.1*
+%lang(pl) %{_mandir}/pl/man8/rpmbuild.8*
+%lang(pl) %{_mandir}/pl/man8/rpmdeps.8*
+#%lang(ru) %{_mandir}/ru/man1/gendiff.1*
+#%lang(ru) %{_mandir}/ru/man8/rpmbuild.8*
+#%lang(ru) %{_mandir}/ru/man8/rpmdeps.8*
+#%lang(sk) %{_mandir}/sk/man1/gendiff.1*
+#%lang(sk) %{_mandir}/sk/man8/rpmbuild.8*
+#%lang(sk) %{_mandir}/sk/man8/rpmdeps.8*
+
%files libs
%{_libdir}/[EMAIL PROTECTED]@[EMAIL PROTECTED]@.so
%{_libdir}/[EMAIL PROTECTED]@[EMAIL PROTECTED]@.so
@@ -348,13 +385,6 @@
%{_libdir}/[EMAIL PROTECTED]@[EMAIL PROTECTED]@.so
%files build
-%dir %{__prefix}/src/rpm
-%dir %{__prefix}/src/rpm/BUILD
-%dir %{__prefix}/src/rpm/SPECS
-%dir %{__prefix}/src/rpm/SOURCES
-%dir %{__prefix}/src/rpm/SRPMS
-%dir %{__prefix}/src/rpm/RPMS
-%{__prefix}/src/rpm/RPMS/*
%rpmattr %{_bindir}/rpmbuild
%rpmattr %{_rpmhome}/brp-*
%rpmattr %{_rpmhome}/check-files
@@ -386,25 +416,6 @@
%rpmattr %{_rpmhome}/vpkg-provides.sh
%rpmattr %{_rpmhome}/vpkg-provides2.sh
-%{_mandir}/man1/gendiff.1*
-%{_mandir}/man8/rpmbuild.8*
-%{_mandir}/man8/rpmdeps.8*
-#%lang(ja) %{_mandir}/ja/man1/gendiff.1*
-%lang(ja) %{_mandir}/ja/man8/rpmbuild.8*
-#%lang(ja) %{_mandir}/ja/man8/rpmdeps.8*
-#%lang(ko) %{_mandir}/ko/man1/gendiff.1*
-#%lang(ko) %{_mandir}/ko/man8/rpmbuild.8*
-#%lang(ko) %{_mandir}/ko/man8/rpmdeps.8*
-%lang(pl) %{_mandir}/pl/man1/gendiff.1*
-%lang(pl) %{_mandir}/pl/man8/rpmbuild.8*
-%lang(pl) %{_mandir}/pl/man8/rpmdeps.8*
-#%lang(ru) %{_mandir}/ru/man1/gendiff.1*
-#%lang(ru) %{_mandir}/ru/man8/rpmbuild.8*
-#%lang(ru) %{_mandir}/ru/man8/rpmdeps.8*
-#%lang(sk) %{_mandir}/sk/man1/gendiff.1*
-#%lang(sk) %{_mandir}/sk/man8/rpmbuild.8*
-#%lang(sk) %{_mandir}/sk/man8/rpmdeps.8*
-
%if %{with_python_subpackage}
%files python
%{_libdir}/python%{with_python_version}/site-packages/rpm
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
