- up to 5.3.11

Changed files:
    rpm-configure-autoconf.patch -> 1.5
    rpm-old-fileconflicts-behaviour.patch -> 1.5
    rpm-rpmpopt.patch -> 1.28
    rpm.spec -> 1.933

diff --git a/rpm-configure-autoconf.patch b/rpm-configure-autoconf.patch
index ca040a4b430a95b304c8043db436d6abd9e35a92..080a09da984d581b8b534d22bbbe80aec3f002f0 100644 (file)
--- a/rpm-configure-autoconf.patch
+++ b/rpm-configure-autoconf.patch
@@ -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], [rpm-devel@rpm5.org])
--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])
  

diff --git a/rpm-old-fileconflicts-behaviour.patch b/rpm-old-fileconflicts-behaviour.patch
index f10ad1af2e7f41c44ec3afdee27e7f706beb889a..95d5158ce68fc7e47bf70dca34de00747e86d29c 100644 (file)
--- a/rpm-old-fileconflicts-behaviour.patch
+++ b/rpm-old-fileconflicts-behaviour.patch
@@ -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),

diff --git a/rpm-rpmpopt.patch b/rpm-rpmpopt.patch
index 99c5fe468b8c9df1a2a8079ed18ca5d10e2b1443..18e3a0cdfb38358ac460f4c59bca1741e8fca4ea 100644 (file)
--- a/rpm-rpmpopt.patch
+++ b/rpm-rpmpopt.patch
@@ -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"

diff --git a/rpm.spec b/rpm.spec
index 276057e8ecc6c534a88d7136e35f18e803ff46ab..cca7569a557cfaf8c129fab37798e540783b5c50 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -63,12 +63,12 @@ Summary(pt_BR.UTF-8):       Gerenciador de pacotes RPM
 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