Author: glen Date: Thu Oct 6 15:39:16 2011 GMT Module: packages Tag: HEAD ---- Log message: - up to 5.3.11
---- Files affected: packages/rpm: rpm-configure-autoconf.patch (1.4 -> 1.5) , rpm-old-fileconflicts-behaviour.patch (1.4 -> 1.5) , rpm-rpmpopt.patch (1.27 -> 1.28) , rpm.spec (1.932 -> 1.933) ---- Diffs: ================================================================ Index: packages/rpm/rpm-configure-autoconf.patch diff -u packages/rpm/rpm-configure-autoconf.patch:1.4 packages/rpm/rpm-configure-autoconf.patch:1.5 --- packages/rpm/rpm-configure-autoconf.patch:1.4 Wed Aug 24 11:03:43 2011 +++ packages/rpm/rpm-configure-autoconf.patch Thu Oct 6 17:39:10 2011 @@ -1,11 +1,11 @@ ---- rpm-5.3.1/configure.ac.wiget 2010-05-30 17:18:27.000000000 +0200 -+++ rpm-5.3.1/configure.ac 2010-05-30 17:18:58.182512451 +0200 -@@ -8,7 +8,7 @@ dnl ## +--- rpm-5.3.11/configure.ac~ 2011-10-06 18:37:01.000000000 +0300 ++++ rpm-5.3.11/configure.ac 2011-10-06 18:37:39.605688527 +0300 +@@ -8,7 +8,7 @@ AC_PREREQ(2.63) m4_define([PACKAGE_BUGREPORT_DEFAULT], [[email protected]]) --AC_INIT([rpm],[5.3.5],[PACKAGE_BUGREPORT_DEFAULT]) -+AC_INIT([rpm],[5.3.5],PACKAGE_BUGREPORT_DEFAULT) - PACKAGE_TIMESTAMP="2010-09-18" dnl # YYYY[-MM[-DD[ HH[:MM]]]] +-AC_INIT([rpm],[5.3.11],[PACKAGE_BUGREPORT_DEFAULT]) ++AC_INIT([rpm],[5.3.11],PACKAGE_BUGREPORT_DEFAULT) + PACKAGE_TIMESTAMP="2011-05-02" dnl # YYYY[-MM[-DD[ HH[:MM]]]] AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION]) ================================================================ Index: packages/rpm/rpm-old-fileconflicts-behaviour.patch diff -u packages/rpm/rpm-old-fileconflicts-behaviour.patch:1.4 packages/rpm/rpm-old-fileconflicts-behaviour.patch:1.5 --- packages/rpm/rpm-old-fileconflicts-behaviour.patch:1.4 Sun Apr 25 23:33:51 2010 +++ packages/rpm/rpm-old-fileconflicts-behaviour.patch Thu Oct 6 17:39:10 2011 @@ -1,11 +1,11 @@ ---- rpm-5.2.0/lib/poptI.c.wiget 2009-04-12 03:25:45.000000000 +0200 -+++ rpm-5.2.0/lib/poptI.c 2010-04-25 22:59:14.467664549 +0200 -@@ -21,7 +21,7 @@ extern time_t get_date(const char * p, v +--- rpm-5.3.11/lib/poptI.c~ 2011-05-08 01:58:28.000000000 +0300 ++++ rpm-5.3.11/lib/poptI.c 2011-10-06 18:36:39.099587792 +0300 +@@ -21,7 +21,7 @@ /*@-fullinitblock@*/ /*@unchecked@*/ struct rpmQVKArguments_s rpmIArgs = { --#if defined(RPM_VENDOR_MANDRIVA) /* dont-filter-install-file-conflicts */ -+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_PLD) /* dont-filter-install-file-conflicts */ +-#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_OPENMAMBA) /* dont-filter-install-file-conflicts */ ++#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_OPENMAMBA) || defined(RPM_VENDOR_PLD) /* dont-filter-install-file-conflicts */ .probFilter = RPMPROB_FILTER_NONE, #else .probFilter = (RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES), ================================================================ Index: packages/rpm/rpm-rpmpopt.patch diff -u packages/rpm/rpm-rpmpopt.patch:1.27 packages/rpm/rpm-rpmpopt.patch:1.28 --- packages/rpm/rpm-rpmpopt.patch:1.27 Wed Aug 24 11:03:44 2011 +++ packages/rpm/rpm-rpmpopt.patch Thu Oct 6 17:39:10 2011 @@ -1,21 +1,5 @@ --- rpm-4.4.4/rpmpopt.in.orig 2005-10-30 02:15:44.000000000 +0200 +++ rpm-4.4.4/rpmpopt.in 2005-11-18 22:43:57.809703712 +0100 -@@ -221,6 +221,15 @@ - rpmb alias --without --define "_without_!#:+ --without-!#:+" \ - --POPTdesc=$"disable configure <option> for build" \ - --POPTargs=$"<option>" -+# (PLD-specific) Make RPM build tree -+rpmb exec --install-build-tree install-build-tree \ -+ --POPTdesc=$"make all needed dirs for building binary rpms" -+# (PLD-specific) Compiling with debuginfo may be enabled by --debug -+rpmb alias --debug --define 'debug 1' \ -+ --POPTdesc=$"build packages with debug information" -+# (PLD-specific) Conditional building -+rpmb exec --bcond find-spec-bcond \ -+ --POPTdesc=$"find all --with/--without values" - #============================================================================== - rpmbuild alias --dbpath --define '_dbpath !#:+' \ - --POPTdesc=$"use database in DIRECTORY" \ @@ -240,6 +249,16 @@ --POPTdesc=$"override build root" \ --POPTargs=$"DIRECTORY" ================================================================ Index: packages/rpm/rpm.spec diff -u packages/rpm/rpm.spec:1.932 packages/rpm/rpm.spec:1.933 --- packages/rpm/rpm.spec:1.932 Wed Aug 24 11:03:44 2011 +++ packages/rpm/rpm.spec Thu Oct 6 17:39:10 2011 @@ -64,12 +64,12 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm -Version: 5.3.5 +Version: 5.3.11 Release: 0.1 License: LGPL Group: Base Source0: http://rpm5.org/files/rpm/rpm-5.3/%{name}-%{version}.tar.gz -# Source0-md5: 7a5112fd208bfda7a1cab20b9ce17a02 +# Source0-md5: 7c1f624c22143324ee372dffd1a209c2 Source1: %{name}.groups Source2: %{name}.platform Source3: %{name}-install-tree @@ -1392,6 +1392,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.933 2011/10/06 15:39:10 glen +- up to 5.3.11 + Revision 1.932 2011/08/24 09:03:44 baggins - up to 5.3.5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm-configure-autoconf.patch?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm-old-fileconflicts-behaviour.patch?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm-rpmpopt.patch?r1=1.27&r2=1.28&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm.spec?r1=1.932&r2=1.933&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
