From 751668e861545ec63cccd1b10eda2553aba0455b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Wed, 24 Aug 2011 09:03:44 +0000 Subject: [PATCH] - 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 --- openmp.patch | 4 ++-- rpm-configure-autoconf.patch | 6 +++--- rpm-macros.patch | 5 +++-- rpm-rpmpopt.patch | 7 ++++--- rpm-scripts-closefds.patch | 6 +++--- rpm.spec | 6 ++---- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/openmp.patch b/openmp.patch index 258cb5f..25eebdc 100644 --- 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 8b81987..ca040a4 100644 --- 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 b70037c..02e4016 100644 --- 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 31d00aa..99c5fe4 100644 --- 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 98a95cc..5a9f787 100644 --- 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 e8fba70..276057e 100644 --- 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 -- 2.44.0