- up to 5.3.5

Changed files:
    openmp.patch -> 1.2
    rpm-configure-autoconf.patch -> 1.4
    rpm-macros.patch -> 1.50
    rpm-rpmpopt.patch -> 1.27
    rpm-scripts-closefds.patch -> 1.4
    rpm.spec -> 1.932

diff --git a/openmp.patch b/openmp.patch
index 258cb5f0378bb1ee2883ae71b77b594160dba26d..25eebdc7fbe4ad37eb87d1b524b6f61202d610a4 100644 (file)
--- a/openmp.patch
+++ b/openmp.patch
@@ -12,11 +12,11 @@
 --- rpm-5.3.1/tools/Makefile.am.wiget  2010-06-01 21:49:05.274449585 +0200
 +++ rpm-5.3.1/tools/Makefile.am        2010-06-01 21:49:56.576943304 +0200
 @@ -281,7 +281,7 @@ if WITH_DBSQL
+ if WITH_DBSQL
  pkgbin_PROGRAMS +=    dbsql
  dbsql_SOURCES = dbsql.c
- dbsql_CFLAGS  = $(CFLAGS) -I../db3/sql -I../db/sql/generated
 -dbsql_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS)
 +dbsql_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) $(OPENMP_CFLAGS)
  dbsql_LDADD = \
-       $(top_builddir)/db3/libdb_sql-5.0.la \
        $(RPMIO_LDADD_COMMON)
+ endif

diff --git a/rpm-configure-autoconf.patch b/rpm-configure-autoconf.patch
index 8b81987f7aa02f49af548fa9cfc950340979f43f..ca040a4b430a95b304c8043db436d6abd9e35a92 100644 (file)
--- a/rpm-configure-autoconf.patch
+++ b/rpm-configure-autoconf.patch
@@ -4,8 +4,8 @@
  
  AC_PREREQ(2.63)
  m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-devel@rpm5.org])
--AC_INIT([rpm],[5.3.1],[PACKAGE_BUGREPORT_DEFAULT])
-+AC_INIT([rpm],[5.3.1],PACKAGE_BUGREPORT_DEFAULT)
- PACKAGE_TIMESTAMP="2009" dnl # YYYY[-MM[-DD[ HH[:MM]]]]
+-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_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION])
  

diff --git a/rpm-macros.patch b/rpm-macros.patch
index b70037c84f9e25ccab084ebbb3534b363e06d3d5..02e40168c71394e1c79bba61a4f1944ec564829c 100644 (file)
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -90,5 +90,6 @@
 +%x8664        x86_64 amd64 ia32e
 +%ppc  ppc ppc7400 ppc7450
 +  
- # \endverbatim
- #*/
+ #==============================================================================
+ # XXX Caveat:
+ # XXX With %{load:...} being interpreted immediately -- not lazily --

diff --git a/rpm-rpmpopt.patch b/rpm-rpmpopt.patch
index 31d00aac2d97fa1dcfafc4130f8602d8686dfdcd..99c5fe468b8c9df1a2a8079ed18ca5d10e2b1443 100644 (file)
--- a/rpm-rpmpopt.patch
+++ b/rpm-rpmpopt.patch
@@ -16,7 +16,7 @@
  #==============================================================================
  rpmbuild      alias --dbpath          --define '_dbpath !#:+' \
        --POPTdesc=$"use database in DIRECTORY" \
-@@ -240,5 +249,15 @@
+@@ -240,6 +249,16 @@
        --POPTdesc=$"override build root" \
        --POPTargs=$"DIRECTORY"
  
@@ -30,8 +30,9 @@
 +rpmbuild exec  --bcond find-spec-bcond \
 +      --POPTdesc=$"find all --with/--without values"
 +
- # \endverbatim
- #*/
+ rpmbuild alias --lsb --noautoreq --noautoprov \
+       --define '_use_internal_dependency_generator 0' \
+       --notinlsb
 ;--- rpm-4.4.9/po/pl.po.orig   2007-05-22 01:10:34.875893544 +0200
 ;+++ rpm-4.4.9/po/pl.po        2007-05-22 08:08:41.253484731 +0200
 ;@@ -4509,6 +4509,18 @@

diff --git a/rpm-scripts-closefds.patch b/rpm-scripts-closefds.patch
index 98a95cc9f054dfcb6f732eb022068153e867f24b..5a9f7871c0cc8e2ed94212d9e5e08052fecdc5a1 100644 (file)
--- a/rpm-scripts-closefds.patch
+++ b/rpm-scripts-closefds.patch
@@ -14,6 +14,6 @@
 +              Fcntl(fd, F_SETFD, (void*)oldfl);
 +          }
 +      }
-       /*@=type@*/
-       return fd;
-       /*@notreached@*/ break;
+ 
+ #if defined(POSIX_FADV_WILLNEED)
+       (void) Fadvise(fd, 0, 0, POSIX_FADV_WILLNEED);

diff --git a/rpm.spec b/rpm.spec
index e8fba70daf786a0d2f59d37c680904a2b83083a2..276057e8ecc6c534a88d7136e35f18e803ff46ab 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.1
+Version:       5.3.5
 Release:       0.1
 License:       LGPL
 Group:         Base
 Source0:       http://rpm5.org/files/rpm/rpm-5.3/%{name}-%{version}.tar.gz
-# Source0-md5: ee172f54e9b596056f8ecf13ae6afa9e
+# Source0-md5: 7a5112fd208bfda7a1cab20b9ce17a02
 Source1:       %{name}.groups
 Source2:       %{name}.platform
 Source3:       %{name}-install-tree
@@ -155,7 +155,6 @@ Patch61:    %{name}-sparc64.patch
 Patch62:       %{name}-gendiff.patch
 Patch63:       %{name}-lua-exit-chroot-correctly.patch
 Patch70:       %{name}-configure-autoconf.patch
-Patch71:       db.patch
 Patch72:       openmp.patch
 URL:           http://rpm5.org/
 BuildRequires: autoconf >= 2.60
@@ -734,7 +733,6 @@ patch26 -p1
 %patch62 -p1
 #patch63 -p1 applied upstream
 %patch70 -p1
-%patch71 -p1
 %patch72 -p1 -b .wiget
 
 cd scripts