SPECS: rpm.spec - merged -base separation and kill-prereq patch fr...

[qboosh]

Author: qboosh                       Date: Fri Oct 21 07:53:34 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged -base separation and kill-prereq patch from AC-branch; release 16.1

---- Files affected:
SPECS:
   rpm.spec (1.705 -> 1.706) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.705 SPECS/rpm.spec:1.706
--- SPECS/rpm.spec:1.705	Tue Oct 18 12:59:56 2005
+++ SPECS/rpm.spec	Fri Oct 21 09:53:27 2005
@@ -31,7 +31,7 @@
 Name:		rpm
 %define	sover	4.4
 Version:	4.4.2
-Release:	5
+Release:	16.1
 License:	GPL
 Group:		Base
 Source0:	ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz
@@ -94,7 +94,7 @@
 Patch35:	%{name}-perl_req-INC_dirs.patch
 Patch36:	%{name}-debuginfo.patch
 Patch37:	%{name}-doxygen_hack.patch
-
+Patch38:	%{name}-kill-prereq.patch
 Patch39:	%{name}-pythondeps.patch
 Patch40:	%{name}-print-requires.patch
 Patch41:	%{name}-reduce-stack-usage.patch
@@ -147,6 +147,7 @@
 %endif
 Requires:	beecrypt >= %{beecrypt_ver}
 Requires:	popt >= %{reqpopt_ver}
+Requires:	%{name}-base = %{version}-%{release}
 Requires:	%{name}-lib = %{version}-%{release}
 %{!?with_static:Obsoletes:	rpm-utils-static}
 Conflicts:	glibc < 2.2.92
@@ -218,6 +219,26 @@
 ÓĚŐÖÂĎ×ϧ ŚÎĆĎŇÍÁĂŚ§, ÝĎ ÍŚÓÔÉÔŘ ÎÁÚ×Ő, ×ĹŇÓŚŔ, ĎĐÉÓ ÔÁ ŚÎŰŐ
 ŚÎĆĎŇÍÁĂŚŔ ĐŇĎ ĐÁËĹÔ.
 
+%package base
+Summary:	RPM base package - scripts used by rpm packages themselves
+Summary(pl):	Podstawowy pakiet RPM - skrypty używane przez same pakiety rpm
+Group:		Base
+Requires:	sed
+Obsoletes:	vserver-rpm
+
+%description base
+The RPM base package contains scripts used by rpm packages themselves.
+These include:
+- scripts for adding/removing groups and users needed for rpm
+  packages,
+- banner.sh to display %%banner messages from rpm scriptlets.
+
+%description base -l pl
+Pakiet podstawowy RPM zwiera skrypty używane przez same pakiety rpm.
+Zawiera on:
+- skrypty dodające/usuwające grupy i użytkowników dla pakietów rpm,
+- banner.sh do pokazywania komunikatów %%banner dla skryptletów rpm.
+
 %package lib
 Summary:	RPMs library
 Summary(pl):	Biblioteki RPM-a
@@ -645,6 +666,7 @@
 %patch35 -p0
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
 %patch39 -p1
 %patch40 -p1
 %patch41 -p1
@@ -736,7 +758,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/%{_lib},/etc/sysconfig,%{_sysconfdir}/rpm}
+install -d $RPM_BUILD_ROOT{/%{_lib},/etc/sysconfig,%{_sysconfdir}/rpm,/var/lib/banner}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -912,8 +934,7 @@
 #%attr(755,root,root) %{_bindir}/rpmverify
 
 %dir %{_sysconfdir}/rpm
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/rpm/macros
-%config(noreplace) %verify(not size mtime md5) /etc/sysconfig/rpm
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rpm/macros
 
 %{_mandir}/man8/rpm.8*
 %lang(fr) %{_mandir}/fr/man8/rpm.8*
@@ -928,21 +949,25 @@
 %dir /var/lock/rpm
 /var/lock/rpm/transaction
 
-%dir %{_rpmlibdir}
 #%attr(755,root,root) %{_rpmlibdir}/rpmd
 #%{!?with_static:%attr(755,root,root) %{_rpmlibdir}/rpm[eiu]}
 #%attr(755,root,root) %{_rpmlibdir}/rpmk
 #%attr(755,root,root) %{_rpmlibdir}/rpm[qv]
 
 %doc %attr(755,root,root) %{_rpmlibdir}/convertrpmrc.sh
-%attr(755,root,root) %{_rpmlibdir}/user_group.sh
-
-%attr(755,root,root) %{_bindir}/banner.sh
 
 %{_rpmlibdir}/rpmrc
 %{_rpmlibdir}/rpmpopt*
 %{_rpmlibdir}/macros
 
+%files base
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rpm
+%dir %{_rpmlibdir}
+%attr(755,root,root) %{_bindir}/banner.sh
+%attr(755,root,root) %{_rpmlibdir}/user_group.sh
+%dir /var/lib/banner
+
 %files lib
 %defattr(644,root,root,755)
 %attr(755,root,root) /%{_lib}/librpm*-*.so
@@ -1007,7 +1032,7 @@
 
 %files build
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/rpm/noauto*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rpm/noauto*
 %attr(755,root,root) %{_rpmlibdir}/compress-doc
 %attr(755,root,root) %{_rpmlibdir}/cross-build
 #%attr(755,root,root) %{_rpmlibdir}/find-provides
@@ -1125,6 +1150,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.706  2005/10/21 07:53:27  qboosh
+- merged -base separation and kill-prereq patch from AC-branch; release 16.1
+
 Revision 1.705  2005/10/18 10:59:56  qboosh
 - typo
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/rpm.spec?r1=1.705&r2=1.706&f=u