Author: glen Date: Fri Feb 15 15:47:58 2008 GMT
Module: SPECS Tag: rpm-4_4_9
---- Log message:
- AC-branch merge
---- Files affected:
SPECS:
rpm.spec (1.837.2.50 -> 1.837.2.51)
---- Diffs:
================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.50 SPECS/rpm.spec:1.837.2.51
--- SPECS/rpm.spec:1.837.2.50 Fri Feb 15 13:33:31 2008
+++ SPECS/rpm.spec Fri Feb 15 16:47:53 2008
@@ -253,6 +253,7 @@
Summary(pl.UTF-8): Podstawowy pakiet RPM - skrypty uĹźywane przez same
pakiety rpm
Group: Base
Requires: filesystem
+Obsoletes: rpm-scripts
Obsoletes: vserver-rpm
%description base
@@ -886,7 +887,7 @@
install %{SOURCE17} $RPM_BUILD_ROOT%{_bindir}/banner.sh
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo
touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Conflictname
touch $RPM_BUILD_ROOT%{_sysconfdir}/rpm/sysinfo/Dirnames
@@ -1271,6 +1272,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.837.2.51 2008-02-15 15:47:53 glen
+- AC-branch merge
+
Revision 1.837.2.50 2008-02-15 12:33:31 tommat
- removed sparc64 patch, already applied as nopie patch
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rpm.spec?r1=1.837.2.50&r2=1.837.2.51&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
