Author: qboosh Date: Sun Apr 10 10:57:08 2011 GMT
Module: packages Tag: rpm-4_5
---- Log message:
- fixed bug in rpmpopt patch which caused random --buildroot behaviour
- release 50
---- Files affected:
packages/rpm:
rpm-rpmpopt.patch (1.25.4.1 -> 1.25.4.2) , rpm.spec (1.837.2.42.2.49.2.100
-> 1.837.2.42.2.49.2.101)
---- Diffs:
================================================================
Index: packages/rpm/rpm-rpmpopt.patch
diff -u packages/rpm/rpm-rpmpopt.patch:1.25.4.1
packages/rpm/rpm-rpmpopt.patch:1.25.4.2
--- packages/rpm/rpm-rpmpopt.patch:1.25.4.1 Tue Jul 29 15:04:34 2008
+++ packages/rpm/rpm-rpmpopt.patch Sun Apr 10 12:57:02 2011
@@ -16,10 +16,10 @@
#==============================================================================
rpmbuild alias --dbpath --define '_dbpath !#:+' \
--POPTdesc=$"use database in DIRECTORY" \
-@@ -247,6 +247,15 @@
- --POPTargs=$"<option>"
+@@ -248,5 +248,14 @@
rpmbuild alias --buildroot --define '.buildroot !#:+' \
--POPTdesc=$"override build root" \
+ --POPTargs=$"DIRECTORY"
+# (PLD-specific) Make RPM build tree
+rpmbuild exec --install-build-tree install-build-tree \
+ --POPTdesc=$"make all needed dirs for building binary rpms"
@@ -29,7 +29,6 @@
+# (PLD-specific) Conditional building
+rpmbuild exec --bcond find-spec-bcond \
+ --POPTdesc=$"find all --with/--without values"
- --POPTargs=$"DIRECTORY"
# \endverbatim
--- rpm-4.5/po/pl.po~ 2008-04-13 03:15:20.000000000 +0300
================================================================
Index: packages/rpm/rpm.spec
diff -u packages/rpm/rpm.spec:1.837.2.42.2.49.2.100
packages/rpm/rpm.spec:1.837.2.42.2.49.2.101
--- packages/rpm/rpm.spec:1.837.2.42.2.49.2.100 Fri Feb 18 13:10:16 2011
+++ packages/rpm/rpm.spec Sun Apr 10 12:57:02 2011
@@ -58,7 +58,7 @@
Summary(uk.UTF-8): Менеджер пакетів від RPM
Name: rpm
Version: 4.5
-Release: 49
+Release: 50
License: LGPL
Group: Base
Source0: %{name}-%{version}.tar.gz
@@ -1486,6 +1486,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.837.2.42.2.49.2.101 2011/04/10 10:57:02 qboosh
+- fixed bug in rpmpopt patch which caused random --buildroot behaviour
+- release 50
+
Revision 1.837.2.42.2.49.2.100 2011/02/18 12:10:16 cactus
- rel 49; rebuild with new libproxy
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm-rpmpopt.patch?r1=1.25.4.1&r2=1.25.4.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm.spec?r1=1.837.2.42.2.49.2.100&r2=1.837.2.42.2.49.2.101&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
