SPECS (AC-branch): rpm.spec - create -base subpackage, it will be ...
glen
glen at pld-linux.org
Wed Oct 12 18:31:16 CEST 2005
Author: glen Date: Wed Oct 12 16:31:16 2005 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- create -base subpackage, it will be always needed by rpm packages adding/removing system users
---- Files affected:
SPECS:
rpm.spec (1.555.2.131 -> 1.555.2.132)
---- Diffs:
================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.555.2.131 SPECS/rpm.spec:1.555.2.132
--- SPECS/rpm.spec:1.555.2.131 Tue Oct 11 11:22:43 2005
+++ SPECS/rpm.spec Wed Oct 12 18:31:10 2005
@@ -32,7 +32,7 @@
Name: rpm
%define sover 4.4
Version: 4.4.2
-Release: 14
+Release: 14.1
License: GPL
Group: Base
Source0: ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz
@@ -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,15 @@
ÓĚŐÖÂĎ×ϧ ŚÎĆĎŇÍÁĂŚ§, ÝĎ ÍŚÓÔÉÔŘ ÎÁÚ×Ő, ×ĹŇÓŚŔ, ĎĐÉÓ ÔÁ ŚÎŰŐ
ŚÎĆĎŇÍÁĂŚŔ ĐŇĎ ĐÁËĹÔ.
+%package base
+Summary: RPM base
+Group: Base
+Obsoletes: vserver-rpm
+
+%description base
+The RPM base package contains userdel and groupdel scripts to delete
+users created by rpm packages from system.
+
%package lib
Summary: RPMs library
Summary(pl): Biblioteki RPM-a
@@ -914,7 +924,6 @@
%dir %{_sysconfdir}/rpm
%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/rpm/macros
-%config(noreplace) %verify(not size mtime md5) /etc/sysconfig/rpm
%{_mandir}/man8/rpm.8*
%lang(fr) %{_mandir}/fr/man8/rpm.8*
@@ -929,21 +938,24 @@
%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 size mtime md5) /etc/sysconfig/rpm
+%dir %{_rpmlibdir}
+%attr(755,root,root) %{_bindir}/banner.sh
+%attr(755,root,root) %{_rpmlibdir}/user_group.sh
+
%files lib
%defattr(644,root,root,755)
%attr(755,root,root) /%{_lib}/librpm*-*.so
@@ -1127,6 +1139,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.555.2.132 2005/10/12 16:31:10 glen
+- create -base subpackage, it will be always needed by rpm packages adding/removing system users
+
Revision 1.555.2.131 2005/10/11 09:22:43 glen
- rpm_macros_rev 1.243
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/rpm.spec?r1=1.555.2.131&r2=1.555.2.132&f=u
More information about the pld-cvs-commit
mailing list