From 94c3f755ba9a866958953e0df4a97df215ad948d Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Wed, 3 Oct 2012 17:30:10 -0700 Subject: [PATCH] Add patch from https://bugzilla.redhat.com/show_bug.cgi?id=783433 to fix spaces in files and directories that are fed to the brp-python-hardlink script - Require zip since java repack jars requires it https://bugzilla.redhat.com/show_bug.cgi?id=857479 - Java jars need the MANIFEST.MF file to be first in the archive https://bugzilla.redhat.com/show_bug.cgi?id=465664 - Fix kernel_source macro to match the directory that kernel sources are installed in https://bugzilla.redhat.com/show_bug.cgi?id=648996 - Patch _mandir, _infodir, and _defaultocdir to use _prefix https://bugzilla.redhat.com/show_bug.cgi?id=853216 --- ...t-rpm-config-9.1.0-java-repack-order.patch | 16 +++++++++++++ redhat-rpm-config-9.1.0-kernel-source.patch | 13 +++++++++++ ...at-rpm-config-9.1.0-use-prefix-macro.patch | 18 +++++++++++++++ redhat-rpm-config.spec | 23 +++++++++++++++++-- 4 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 redhat-rpm-config-9.1.0-java-repack-order.patch create mode 100644 redhat-rpm-config-9.1.0-kernel-source.patch create mode 100644 redhat-rpm-config-9.1.0-use-prefix-macro.patch diff --git a/redhat-rpm-config-9.1.0-java-repack-order.patch b/redhat-rpm-config-9.1.0-java-repack-order.patch new file mode 100644 index 0000000..fb83e96 --- /dev/null +++ b/redhat-rpm-config-9.1.0-java-repack-order.patch @@ -0,0 +1,16 @@ +Index: redhat-rpm-config-9.1.0/brp-java-repack-jars +=================================================================== +--- redhat-rpm-config-9.1.0.orig/brp-java-repack-jars ++++ redhat-rpm-config-9.1.0/brp-java-repack-jars +@@ -79,7 +79,10 @@ if [ ! -z "$JARS" ]; then + pushd $JARDIR > /dev/null + + if [ -n "`find -not -name '.'`" ]; then +- find * -not -name '.' | LC_ALL=C sort | /usr/bin/zip -q -X -9 $j -@ ++ if [ -e META-INF/MANIFEST.MF ]; then ++ /usr/bin/zip -q -X -9 $j META-INF/MANIFEST.MF ++ fi ++ find * -not -name '.' | LC_ALL=C sort | /usr/bin/zip -u -q -X -9 $j -@ + else + # Put the empty jar back + touch $j diff --git a/redhat-rpm-config-9.1.0-kernel-source.patch b/redhat-rpm-config-9.1.0-kernel-source.patch new file mode 100644 index 0000000..965fabe --- /dev/null +++ b/redhat-rpm-config-9.1.0-kernel-source.patch @@ -0,0 +1,13 @@ +Index: redhat-rpm-config-9.1.0/macros +=================================================================== +--- redhat-rpm-config-9.1.0.orig/macros ++++ redhat-rpm-config-9.1.0/macros +@@ -239,7 +239,7 @@ kernel_module_package_release 1 + done \ + fi \ + echo "%%global flavors_to_build ${flavors_to_build:-%%nil}" \ +- echo "%%global kernel_source() /usr/src/kernels/%kverrel-\\\$([ %%%%{1} = default ] || echo "%%%%{1}-")%_target_cpu" \ ++ echo "%%global kernel_source() /usr/src/kernels/%kverrel-\\\$([ %%%%{1} = default ] || echo "%%%%{1}.")%_target_cpu" \ + if [ ! -z "%{-f*}" ] \ + then \ + filelist="%{-f*}" \ diff --git a/redhat-rpm-config-9.1.0-use-prefix-macro.patch b/redhat-rpm-config-9.1.0-use-prefix-macro.patch new file mode 100644 index 0000000..eac4395 --- /dev/null +++ b/redhat-rpm-config-9.1.0-use-prefix-macro.patch @@ -0,0 +1,18 @@ +Index: redhat-rpm-config-9.1.0/macros +=================================================================== +--- redhat-rpm-config-9.1.0.orig/macros ++++ redhat-rpm-config-9.1.0/macros +@@ -14,10 +14,10 @@ + %_prefix /usr + %_sysconfdir /etc + %_localstatedir /var +-%_infodir /usr/share/info +-%_mandir /usr/share/man ++%_infodir %{_prefix}/share/info ++%_mandir %{_prefix}/share/man + +-%_defaultdocdir %{_usr}/share/doc ++%_defaultdocdir %{_prefix}/share/doc + + %_fmoddir %{_libdir}/gfortran/modules + diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index e9fd236..9945f74 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -1,7 +1,7 @@ Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config Version: 9.1.0 -Release: 33%{?dist} +Release: 34%{?dist} # No version specified. License: GPL+ Group: Development/System @@ -31,12 +31,20 @@ Patch7: redhat-rpm-config-9.1.0-hardened.patch Patch8: redhat-rpm-config-9.1.0-ppc-no-minimal-toc.patch Patch9: redhat-rpm-config-9.1.0-dwz.patch Patch10: redhat-rpm-config-9.1.0-minidebuginfo.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=783433 Patch11: redhat-rpm-config-9.1.0-python-hardlink-spaces-in-filenames.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=853216 +Patch12:redhat-rpm-config-9.1.0-use-prefix-macro.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=648996 +Patch13: redhat-rpm-config-9.1.0-kernel-source.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=465664 +Patch14: redhat-rpm-config-9.1.0-java-repack-order.patch BuildArch: noarch Requires: coreutils Requires: perl-srpm-macros Requires: rpm >= 4.6.0 Requires: dwz >= 0.4 +Requires: zip BuildRequires: libtool %description @@ -56,6 +64,9 @@ Red Hat specific rpm configuration files. %patch9 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 %build @@ -77,10 +88,18 @@ rm -rf ${RPM_BUILD_ROOT} %{_sysconfdir}/rpm/* %changelog -* Wed Oct 3 2012 Toshio Kuratomi - 9.1.0-33 +* Wed Oct 3 2012 Toshio Kuratomi - 9.1.0-34 - Add patch from https://bugzilla.redhat.com/show_bug.cgi?id=783433 to fix spaces in files and directories that are fed to the brp-python-hardlink script +- Require zip since java repack jars requires it + https://bugzilla.redhat.com/show_bug.cgi?id=857479 +- Java jars need the MANIFEST.MF file to be first in the archive + https://bugzilla.redhat.com/show_bug.cgi?id=465664 +- Fix kernel_source macro to match the directory that kernel sources are installed in + https://bugzilla.redhat.com/show_bug.cgi?id=648996 +- Patch _mandir, _infodir, and _defaultocdir to use _prefix + https://bugzilla.redhat.com/show_bug.cgi?id=853216 * Sat Jul 21 2012 Fedora Release Engineering - 9.1.0-33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild