From ebe974a840ba7c087ac73c4804585a7a7a73a219 Mon Sep 17 00:00:00 2001 From: Artur Frysiak Date: Tue, 1 Jun 2010 20:34:10 +0000 Subject: [PATCH] Updated to 5.3.1 Changed files: rpm-compress-doc.patch -> 1.9 rpm-configure-autoconf.patch -> 1.3 rpm-debuginfo.patch -> 1.21 rpm-macros-th.patch -> 1.8 rpm-macros.patch -> 1.49 rpm-mono.patch -> 1.8 rpm-perl-macros.patch -> 1.34 rpm-php-macros.patch -> 1.2 --- rpm-compress-doc.patch | 6 ++--- rpm-configure-autoconf.patch | 10 ++++---- rpm-debuginfo.patch | 35 +++++++++++++------------- rpm-macros-th.patch | 19 +++++++------- rpm-macros.patch | 48 ++++++++++++++++-------------------- rpm-mono.patch | 9 +++---- rpm-perl-macros.patch | 29 +++++++++++----------- rpm-php-macros.patch | 17 ++++++------- 8 files changed, 81 insertions(+), 92 deletions(-) diff --git a/rpm-compress-doc.patch b/rpm-compress-doc.patch index e358453..2a87e6c 100644 --- a/rpm-compress-doc.patch +++ b/rpm-compress-doc.patch @@ -1,6 +1,6 @@ -diff -ur rpm-4.0.4/macros.in rpm-4.0.4-/macros.in ---- rpm-4.0.4/macros.in Fri May 17 11:18:12 2002 -+++ rpm-4.0.4-/macros.in Fri May 17 11:17:44 2002 +diff -ur rpm-4.0.4/macros/macros.in rpm-4.0.4-/macros/macros.in +--- rpm-4.0.4/macros/macros.in Fri May 17 11:18:12 2002 ++++ rpm-4.0.4-/macros/macros.in Fri May 17 11:17:44 2002 @@ -1208,6 +1208,9 @@ #%__spec_triggerin_pre %{nil} #%__spec_triggerin_post %{nil} diff --git a/rpm-configure-autoconf.patch b/rpm-configure-autoconf.patch index c76b8b4..8b81987 100644 --- a/rpm-configure-autoconf.patch +++ b/rpm-configure-autoconf.patch @@ -1,11 +1,11 @@ ---- rpm-5.2.0/configure.ac.wiget 2010-04-25 23:03:56.000000000 +0200 -+++ rpm-5.2.0/configure.ac 2010-04-25 23:04:35.190129911 +0200 +--- 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 ## AC_PREREQ(2.63) - AC_DEFUN([PACKAGE_BUGREPORT_DEFAULT], [rpm-devel@rpm5.org]) --AC_INIT([rpm],[5.2.0],[PACKAGE_BUGREPORT_DEFAULT]) -+AC_INIT([rpm],[5.2.0],PACKAGE_BUGREPORT_DEFAULT) + 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_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION]) diff --git a/rpm-debuginfo.patch b/rpm-debuginfo.patch index 3eefc98..2ea8c59 100644 --- a/rpm-debuginfo.patch +++ b/rpm-debuginfo.patch @@ -1,7 +1,17 @@ -diff -ur rpm.org/macros.in rpm/macros.in ---- rpm.org/macros.in 2007-10-02 20:31:56.905775000 +0200 -+++ rpm/macros.in 2007-10-02 20:35:30.122401828 +0200 -@@ -195,15 +195,21 @@ +--- rpm-5.3.1/macros/macros.rpmbuild.in.wiget 2010-03-31 14:22:06.000000000 +0200 ++++ rpm-5.3.1/macros/macros.rpmbuild.in 2010-05-30 16:51:46.906008986 +0200 +@@ -383,7 +383,7 @@ echo "Patch #%{__patch_number} (%{basena + %{?buildroot:%{__rm} -rf '%{buildroot}'; %{__mkdir_p} '%{buildroot}'} + %__spec_install_body %{___build_body} + %__spec_install_post\ +-%{?__debug_package:%{__debug_install_post}}\ ++%{expand:%%define __sip_%{?_enable_debug_packages} 1}%{?__sip_1:%{?__debug_package:%{__debug_install_post}}}%{expand:%%undefine __sip_%{?_enable_debug_packages}}\ + %{__arch_install_post}\ + %{__os_install_post}\ + %{nil} +--- rpm-5.3.1/macros/macros.in.wiget 2010-05-30 16:47:23.389365448 +0200 ++++ rpm-5.3.1/macros/macros.in 2010-05-30 16:47:23.412699985 +0200 +@@ -131,15 +131,21 @@ %debug_package \ %ifnarch noarch\ %global __debug_package 1\ @@ -26,24 +36,15 @@ diff -ur rpm.org/macros.in rpm/macros.in %defattr(-,root,root)\ %endif\ %{nil} -@@ -1123,7 +1129,7 @@ - %{?buildroot:%{__rm} -rf '%{buildroot}'} - %__spec_install_body %{___build_body} - %__spec_install_post\ --%{?__debug_package:%{__debug_install_post}}\ -+%{expand:%%define __sip_%{?_enable_debug_packages} 1}%{?__sip_1:%{?__debug_package:%{__debug_install_post}}}%{expand:%%undefine __sip_%{?_enable_debug_packages}}\ - %{__arch_install_post}\ - %{__os_install_post}\ - %{nil} ---- rpm.org/scripts/find-debuginfo.sh 2007-09-06 09:36:38.000000000 +0200 -+++ rpm/scripts/find-debuginfo.sh 2007-10-02 20:38:57.745519759 +0200 -@@ -92,7 +92,8 @@ +--- rpm-5.3.1/scripts/find-debuginfo.sh.wiget 2009-09-10 03:52:13.000000000 +0200 ++++ rpm-5.3.1/scripts/find-debuginfo.sh 2010-05-30 16:53:33.275994510 +0200 +@@ -92,7 +92,8 @@ strip_to_debug() $strip_g && case "$(file -bi "$2")" in application/x-sharedlib,*) g=-g ;; esac - eu-strip --remove-comment $g -f "$1" "$2" || exit + objcopy --only-keep-debug --remove-section .comment "$2" "$1" || exit + objcopy --add-gnu-debuglink="$1" "$2" || exit + chmod 444 "$1" || exit } - # Make a relative symlink to $1 called $3$2 diff --git a/rpm-macros-th.patch b/rpm-macros-th.patch index f3f4a01..726a7b8 100644 --- a/rpm-macros-th.patch +++ b/rpm-macros-th.patch @@ -1,19 +1,18 @@ -diff -ur rpm-4.4.9.org/macros.in rpm-4.4.9/macros.in ---- rpm-4.4.9.org/macros.in 2008-07-24 08:52:35.205363000 +0200 -+++ rpm-4.4.9/macros.in 2008-07-24 09:01:00.351355186 +0200 -@@ -275,6 +275,9 @@ +--- rpm-5.3.1/macros/macros.rpmbuild.in.wiget 2010-05-30 17:11:07.699227892 +0200 ++++ rpm-5.3.1/macros/macros.rpmbuild.in 2010-05-30 17:12:37.700048249 +0200 +@@ -102,6 +102,9 @@ # #%distribution +# PLD Linux Release +%pld_release th + - # Configurable distribution URL, same as DistURL: tag in a specfile. - # The URL will be used to supply reliable information to tools like - # rpmfind. ---- rpm/macros.in~ 2008-07-29 15:33:40.289757059 +0200 -+++ rpm/macros.in 2008-07-29 15:37:14.559735562 +0200 -@@ -1635,7 +1635,8 @@ + # Configurable bug URL, same as BugURL: tag in a specfile. + # The URL will be used to supply reliable information to where + # to file bugs. +--- rpm-5.3.1/macros/macros.in.wiget 2010-05-30 17:10:50.702560935 +0200 ++++ rpm-5.3.1/macros/macros.in 2010-05-30 17:10:50.705892723 +0200 +@@ -956,7 +956,8 @@ pakietu oraz przy odpluskwianiu samego p # -feliminate-dwarf2-dups disabled until PR ld/3290 is fixed. %debugcflags -O0 -g -Wall diff --git a/rpm-macros.patch b/rpm-macros.patch index a220320..b70037c 100644 --- a/rpm-macros.patch +++ b/rpm-macros.patch @@ -1,6 +1,19 @@ ---- rpm-5.2.0/macros.in.wiget 2010-04-24 18:05:03.413900239 +0200 -+++ rpm-5.2.0/macros.in 2010-04-24 18:06:23.963891557 +0200 -@@ -220,7 +220,7 @@ pakietu oraz przy odpluskwianiu samego p +--- rpm-5.3.1/macros/macros.rpmbuild.in.wiget 2010-05-30 17:03:38.009271449 +0200 ++++ rpm-5.3.1/macros/macros.rpmbuild.in 2010-05-30 17:08:25.676741951 +0200 +@@ -123,8 +123,8 @@ + # "w6.lzdio" lzma level 6 (legacy, stable). + # "w6.xzdio" xz level 6 (obsoletes lzma, unstable). + # +-#%_source_payload w9.gzdio +-#%_binary_payload w9.gzdio ++%_source_payload w9.gzdio ++%_binary_payload w9.lzdio + + # Archive formats to use for source/binary package payloads. + # "cpio" cpio archive (default) +--- rpm-5.3.1/macros/macros.in.wiget 2010-05-30 17:03:38.009271449 +0200 ++++ rpm-5.3.1/macros/macros.in 2010-05-30 17:06:26.886075137 +0200 +@@ -150,7 +150,7 @@ pakietu oraz przy odpluskwianiu samego p %endif\ %{nil} @@ -9,7 +22,7 @@ # The path to the pgp executable (legacy, use %{__pgp} instead). %_pgpbin %{__pgp} -@@ -253,14 +253,14 @@ pakietu oraz przy odpluskwianiu samego p +@@ -183,14 +183,14 @@ pakietu oraz przy odpluskwianiu samego p %_buildrootdir @BUILDROOTDIR_MACRO@ # Build root path, where %install installs the package during build. @@ -28,24 +41,13 @@ #============================================================================== # ---- Optional macros. -@@ -367,8 +367,8 @@ pakietu oraz przy odpluskwianiu samego p - # "w6.lzdio" lzma level 6 (legacy, stable). - # "w6.xzdio" xz level 6 (obsoletes lzma, unstable). - # --#%_source_payload w9.gzdio --#%_binary_payload w9.gzdio -+%_source_payload w9.gzdio -+%_binary_payload w9.lzdio - - # Archive formats to use for source/binary package payloads. - # "cpio" cpio archive (default) -@@ -1411,17 +1411,17 @@ print (t)\ - %_exec_prefix %{_prefix} +@@ -846,11 +846,11 @@ pakietu oraz przy odpluskwianiu samego p + %_datarootdir %{_prefix}/share %_bindir %{_exec_prefix}/bin %_sbindir %{_exec_prefix}/sbin -%_libexecdir %{_exec_prefix}/libexec +%_libexecdir %{_exec_prefix}/lib - %_datadir %{_prefix}/share + %_datadir %{_datarootdir} -%_sysconfdir %{_prefix}/etc -%_sharedstatedir %{_prefix}/com -%_localstatedir %{_prefix}/var @@ -55,15 +57,7 @@ %_lib lib %_libdir %{_exec_prefix}/%{_lib} %_includedir %{_prefix}/include - %_oldincludedir /usr/include --%_infodir %{_prefix}/info --%_mandir %{_prefix}/man -+%_infodir %{_prefix}/share/info -+%_mandir %{_prefix}/share/man - %_localedir %{_datadir}/locale - - %_initrddir %{_sysconfdir}/rc.d/init.d -@@ -1755,7 +1755,33 @@ PreReq: python >= %{python_version}, pyt +@@ -941,7 +941,33 @@ pakietu oraz przy odpluskwianiu samego p # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}. #%__executable_provides %{_rpmhome}/executabledeps.sh --provides #%__executable_requires %{_rpmhome}/executabledeps.sh --requires diff --git a/rpm-mono.patch b/rpm-mono.patch index f4c6511..6801f03 100644 --- a/rpm-mono.patch +++ b/rpm-mono.patch @@ -1,6 +1,6 @@ ---- rpm-5.0.1/macros.in~ 2008-01-31 00:06:10.000000000 +0200 -+++ rpm-5.0.1/macros.in 2008-01-31 00:07:31.097681189 +0200 -@@ -1578,8 +1578,8 @@ +--- rpm-5.3.1/macros/mono.in.wiget 2010-05-30 16:58:43.653464509 +0200 ++++ rpm-5.3.1/macros/mono.in 2010-05-30 16:59:15.576066903 +0200 +@@ -6,5 +6,5 @@ # # Note: Used iff _use_internal_dependency_generator is non-zero. The # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}. @@ -8,6 +8,3 @@ -%__mono_requires %{_rpmhome}/mono-find-requires +%__mono_provides %{nil} +%__mono_requires %{nil} - - #------------------------------------------------------------------------ - # executable(...) configuration. diff --git a/rpm-perl-macros.patch b/rpm-perl-macros.patch index 3392359..c99ad2e 100644 --- a/rpm-perl-macros.patch +++ b/rpm-perl-macros.patch @@ -1,16 +1,15 @@ -diff -urN rpm-4.3.org/configure.ac rpm-4.3/configure.ac ---- rpm-4.3.org/configure.ac 2004-01-07 01:51:35.251160244 +0100 -+++ rpm-4.3/configure.ac 2004-01-07 01:55:53.198560246 +0100 -@@ -1313,6 +1313,7 @@ - Doxyfile Makefile macros rpmpopt rpm.spec - rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile - scripts/Makefile scripts/macros.perl scripts/macros.php +--- rpm-5.3.1/configure.ac.wiget 2010-05-22 17:15:11.000000000 +0200 ++++ rpm-5.3.1/configure.ac 2010-05-30 16:37:59.526924459 +0200 +@@ -2198,6 +2198,7 @@ AC_CONFIG_FILES([ po/Makefile.in + build/Makefile build/auto/Makefile build/auto/desc build/auto/types + tools/Makefile + scripts/Makefile + scripts/perl.req scripts/perl.prov - scripts/macros.python tools/Makefile misc/Makefile doc/Makefile - doc/manual/Makefile doc/fr/Makefile doc/ja/Makefile doc/ko/Makefile - doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile python/Makefile ---- rpm-4.4.9/scripts/perl.req.orig 2006-07-08 16:13:50.000000000 +0200 -+++ rpm-4.4.9/scripts/perl.req 2008-03-24 01:13:31.985544655 +0100 + rpmdb/DB_CONFIG + macros/macros macros/macros.rpmbuild + macros/java macros/libtool macros/mono macros/perl +--- rpm-5.3.1/scripts/perl.req.wiget 2008-10-26 10:50:53.000000000 +0100 ++++ rpm-5.3.1/scripts/perl.req 2010-05-30 16:35:36.999438206 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!@__PERL@ @@ -30,7 +29,7 @@ diff -urN rpm-4.3.org/configure.ac rpm-4.3/configure.ac } } else { -@@ -49,7 +53,11 @@ +@@ -49,7 +53,11 @@ if ("@ARGV") { # contents of the file. foreach (<>) { @@ -43,7 +42,7 @@ diff -urN rpm-4.3.org/configure.ac rpm-4.3/configure.ac } } -@@ -203,19 +211,41 @@ +@@ -215,19 +223,41 @@ sub process_file { $module =~ s/\(\s*\)$//; @@ -95,7 +94,7 @@ diff -urN rpm-4.3.org/configure.ac rpm-4.3/configure.ac }; -@@ -232,7 +262,31 @@ +@@ -244,7 +274,31 @@ sub process_file { # will be included with the name sys/systeminfo.ph so only use the # basename of *.ph files diff --git a/rpm-php-macros.patch b/rpm-php-macros.patch index 2a314d0..e16dc36 100644 --- a/rpm-php-macros.patch +++ b/rpm-php-macros.patch @@ -1,11 +1,10 @@ ---- rpm-4.0.4/configure.ac.wiget Tue Feb 12 23:26:36 2002 -+++ rpm-4.0.4/configure.ac Tue Feb 12 23:27:46 2002 -@@ -1314,6 +1314,7 @@ - rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile - scripts/Makefile scripts/macros.perl scripts/macros.php +--- rpm-5.3.1/configure.ac.wiget 2010-05-30 16:43:06.000000000 +0200 ++++ rpm-5.3.1/configure.ac 2010-05-30 16:43:38.482725491 +0200 +@@ -2199,6 +2199,7 @@ AC_CONFIG_FILES([ po/Makefile.in + tools/Makefile + scripts/Makefile scripts/perl.req scripts/perl.prov + scripts/php.req scripts/php.prov - scripts/macros.python tools/Makefile misc/Makefile doc/Makefile - doc/manual/Makefile doc/fr/Makefile doc/ja/Makefile doc/ko/Makefile - doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile python/Makefile - + rpmdb/DB_CONFIG + macros/macros macros/macros.rpmbuild + macros/java macros/libtool macros/mono macros/perl -- 2.44.0