diff --git a/SOURCES/redhat-rpm-config-9.0.3-latest-kernel.patch b/SOURCES/redhat-rpm-config-9.0.3-latest-kernel.patch new file mode 100644 index 0000000..193809a --- /dev/null +++ b/SOURCES/redhat-rpm-config-9.0.3-latest-kernel.patch @@ -0,0 +1,11 @@ +--- redhat-rpm-config-9.0.3/macros.orig 2016-01-05 16:21:18.708529423 +0100 ++++ redhat-rpm-config-9.0.3/macros 2016-01-05 16:42:26.023939895 +0100 +@@ -202,7 +202,7 @@ + %global kmodtool %{-s*}%{!-s:/usr/lib/rpm/redhat/kmodtool} \ + %global kmod_version %{-v*}%{!-v:%{version}} \ + %global kmod_release %{-r*}%{!-r:%{release}} \ +- %global latest_kernel %(rpm -q --qf '%{VERSION}-%{RELEASE}.%{ARCH}\\\\n' `rpm -q kernel-devel | /usr/lib/rpm/redhat/rpmsort -r | head -n 1` | head -n 1) \ ++ %global latest_kernel %(rpm -q --qf '%{VERSION}-%{RELEASE}.%{ARCH}\\\\n' `rpm -qa | egrep "^kernel(-rt|-aarch64)?-devel" | /usr/lib/rpm/redhat/rpmsort -r | head -n 1` | head -n 1) \ + %{!?kernel_version:%{expand:%%global kernel_version %{latest_kernel}}} \ + %global kverrel %(%{kmodtool} verrel %{?kernel_version} 2>/dev/null) \ + flavors="default" \ diff --git a/SOURCES/redhat-rpm-config-9.0.3-shebang.patch b/SOURCES/redhat-rpm-config-9.0.3-shebang.patch new file mode 100644 index 0000000..b252022 --- /dev/null +++ b/SOURCES/redhat-rpm-config-9.0.3-shebang.patch @@ -0,0 +1,11 @@ +--- redhat-rpm-config-9.0.3/find-requires.original 2015-01-07 10:47:24.250285190 +0900 ++++ redhat-rpm-config-9.0.3/find-requires 2015-01-07 10:48:01.483585227 +0900 +@@ -74,7 +74,7 @@ fi + # --- Script interpreters. + for f in $scriptlist; do + [ -r $f -a -x $f ] || continue +- interp=`head -n 1 $f | sed -e 's/^\#\![ ]*//' | cut -d" " -f1` ++ interp=`head -n 1 $f | grep '^#!' | sed -e 's/^\#\![ ]*//' | cut -d" " -f1` + interplist="$interplist $interp" + case $interp in + */perl) perllist="$perllist $f" ;; diff --git a/SOURCES/redhat-rpm-config-9.1.0-Add-_pkgdocdir.patch b/SOURCES/redhat-rpm-config-9.1.0-Add-_pkgdocdir.patch new file mode 100644 index 0000000..40530fa --- /dev/null +++ b/SOURCES/redhat-rpm-config-9.1.0-Add-_pkgdocdir.patch @@ -0,0 +1,26 @@ +From e606f56f34f55900ef4d52fd273192425fe50ba5 Mon Sep 17 00:00:00 2001 +From: Kevin Fenzi +Date: Wed, 24 Jul 2013 16:20:05 -0600 +Subject: [PATCH] Make docdirs unversioned on Fedora 20+ (#986871) + +Add macros but keep it versioned for RHEL 7 +--- + macros | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/macros b/macros +index 6994751..3776e60 100644 +--- a/macros ++++ b/macros +@@ -18,6 +18,8 @@ + %_mandir %{_prefix}/share/man + + %_defaultdocdir %{_prefix}/share/doc ++%_pkgdocdir %{_docdir}/%{name} ++%_docdir_fmt %%{NAME}-%%{VERSION} + + %_fmoddir %{_libdir}/gfortran/modules + +-- +2.5.5 + diff --git a/SOURCES/redhat-rpm-config-9.1.0-Fix-stripping-of-binaries.patch b/SOURCES/redhat-rpm-config-9.1.0-Fix-stripping-of-binaries.patch new file mode 100644 index 0000000..af8546c --- /dev/null +++ b/SOURCES/redhat-rpm-config-9.1.0-Fix-stripping-of-binaries.patch @@ -0,0 +1,44 @@ +Based on: + +From 5b4805df2085b0e7c4f09caad62638c3238b3bc1 Mon Sep 17 00:00:00 2001 +From: Florian Festi +Date: Tue, 30 Jun 2015 11:39:21 +0200 +Subject: [PATCH] Fix stripping of binaries for changed file output. + +file will print a "warning" that it only processed up to 256 notes. + + - Related: 659614aeb6fffe3b249c12b442bd85129100f73b + - Related: http://rpm.org/ticket/887 + - Related: rhbz#1206312 + +--- redhat-rpm-config-9.1.0/brp-strip.orig 2010-02-02 10:24:04.000000000 +0100 ++++ redhat-rpm-config-9.1.0/brp-strip 2016-05-11 14:21:47.846187676 +0200 +@@ -9,6 +9,6 @@ + for f in `find $RPM_BUILD_ROOT -type f \( -perm -0100 -or -perm -0010 -or -perm -0001 \) -exec file {} \; | \ + grep -v "^${RPM_BUILD_ROOT}/\?usr/lib/debug" | \ + grep -v ' shared object,' | \ +- sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped/\1/p'`; do ++ sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped.*/\1/p'`; do + $STRIP -g "$f" || : + done +--- redhat-rpm-config-9.1.0/brp-strip-comment-note.orig 2010-02-02 10:24:04.000000000 +0100 ++++ redhat-rpm-config-9.1.0/brp-strip-comment-note 2016-05-11 14:21:47.846187676 +0200 +@@ -13,7 +13,7 @@ + # for already stripped elf files in the build root + for f in `find $RPM_BUILD_ROOT -type f \( -perm -0100 -or -perm -0010 -or -perm -0001 \) -exec file {} \; | \ + grep -v "^${RPM_BUILD_ROOT}/\?usr/lib/debug" | \ +- sed -n -e 's/^\(.*\):[ ]*ELF.*, stripped/\1/p'`; do ++ sed -n -e 's/^\(.*\):[ ]*ELF.*, stripped.*/\1/p'`; do + note="-R .note" + if $OBJDUMP -h $f | grep '^[ ]*[0-9]*[ ]*.note[ ]' -A 1 | \ + grep ALLOC >/dev/null; then +--- redhat-rpm-config-9.1.0/brp-strip-shared.orig 2010-02-02 10:24:04.000000000 +0100 ++++ redhat-rpm-config-9.1.0/brp-strip-shared 2016-05-11 14:21:47.846187676 +0200 +@@ -15,6 +15,6 @@ + for f in `find $RPM_BUILD_ROOT -type f -a -exec file {} \; | \ + grep -v "^${RPM_BUILD_ROOT}/\?usr/lib/debug" | \ + grep ' shared object,' | \ +- sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped/\1/p'`; do ++ sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped.*/\1/p'`; do + $STRIP --strip-unneeded "$f" + done diff --git a/SOURCES/redhat-rpm-config-9.1.0-arches-macros.patch b/SOURCES/redhat-rpm-config-9.1.0-arches-macros.patch index ccb7f3e..0b897a5 100644 --- a/SOURCES/redhat-rpm-config-9.1.0-arches-macros.patch +++ b/SOURCES/redhat-rpm-config-9.1.0-arches-macros.patch @@ -3,7 +3,7 @@ diff -uNr redhat-rpm-config-9.1.0-orig/macros.ghc-srpm redhat-rpm-config-9.1.0/m +++ redhat-rpm-config-9.1.0/macros.ghc-srpm 2011-05-27 10:19:29.504287354 -0500 @@ -0,0 +1,3 @@ +# macro defining the archs that ghc runs on in fedora -+%ghc_arches %{ix86} x86_64 ppc ppc64 alpha sparcv9 armv7hl armv5tel s390 s390x ++%ghc_arches %{ix86} x86_64 ppc ppc64 ppc64le alpha sparcv9 armv7hl armv5tel s390 s390x aarch64 +%ghc_arches_with_ghci %{ix86} x86_64 ppc sparcv9 armv7hl armv5tel diff -uNr redhat-rpm-config-9.1.0-orig/macros.mono-srpm redhat-rpm-config-9.1.0/macros.mono-srpm --- redhat-rpm-config-9.1.0-orig/macros.mono-srpm 1969-12-31 18:00:00.000000000 -0600 @@ -26,7 +26,7 @@ diff -uNr redhat-rpm-config-9.1.0-orig/macros.ocaml-srpm redhat-rpm-config-9.1.0 +++ redhat-rpm-config-9.1.0/macros.ocaml-srpm 2011-05-27 10:42:10.638194240 -0500 @@ -0,0 +1,2 @@ +# arches that ocaml runs on -+%ocaml_arches alpha %{arm} %{ix86} ia64 x86_64 ppc sparc sparcv9 ppc64 ++%ocaml_arches aarch64 alpha %{arm} %{ix86} ia64 x86_64 ppc ppc64 ppc64le sparc sparcv9 diff -uNr redhat-rpm-config-9.1.0-orig/macros.gnat-srpm redhat-rpm-config-9.1.0/macros.gnat-srpm --- redhat-rpm-config-9.1.0-orig/macros.gnat-srpm 1970-01-01 01:00:00.000000000 +0100 +++ redhat-rpm-config-9.1.0/macros.gnat-srpm 2012-01-05 17:04:35.000000000 +0100 @@ -34,7 +34,7 @@ diff -uNr redhat-rpm-config-9.1.0-orig/macros.gnat-srpm redhat-rpm-config-9.1.0/ +# GNAT_arches lists the architectures where GNAT is available in Fedora. Ada +# packages won't build on other architectures until GNAT is bootstrapped for +# them. -+%GNAT_arches %{ix86} x86_64 ia64 ppc ppc64 alpha ++%GNAT_arches %{ix86} x86_64 ia64 ppc ppc64 ppc64le alpha aarch64 diff -uNr redhat-rpm-config-9.1.0-orig/Makefile redhat-rpm-config-9.1.0/Makefile --- redhat-rpm-config-9.1.0-orig/Makefile 2010-02-02 03:24:04.000000000 -0600 +++ redhat-rpm-config-9.1.0/Makefile 2011-05-27 10:43:34.898205307 -0500 diff --git a/SOURCES/redhat-rpm-config-9.1.0-centos.dist.patch b/SOURCES/redhat-rpm-config-9.1.0-centos.dist.patch deleted file mode 100644 index bdb0ee2..0000000 --- a/SOURCES/redhat-rpm-config-9.1.0-centos.dist.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNrp redhat-rpm-config-9.1.0.orig/dist.sh redhat-rpm-config-9.1.0/dist.sh ---- redhat-rpm-config-9.1.0.orig/dist.sh 2010-02-02 03:24:04.000000000 -0600 -+++ redhat-rpm-config-9.1.0/dist.sh 2014-06-19 09:29:04.064790458 -0500 -@@ -25,7 +25,7 @@ function check_rhl { - } - - function check_rhel { -- egrep -q "(Enterprise|Advanced)" $RELEASEFILE && echo $DISTNUM -+ egrep -q "(Enterprise|Advanced|CentOS)" $RELEASEFILE && echo $DISTNUM - } - - function check_fedora { diff --git a/SOURCES/redhat-rpm-config-9.1.0-find-provides.libtool.patch b/SOURCES/redhat-rpm-config-9.1.0-find-provides.libtool.patch new file mode 100644 index 0000000..44b5854 --- /dev/null +++ b/SOURCES/redhat-rpm-config-9.1.0-find-provides.libtool.patch @@ -0,0 +1,15 @@ +--- redhat-rpm-config-9.1.0/find-provides.libtool.orig 2016-05-11 14:36:17.082744500 +0200 ++++ redhat-rpm-config-9.1.0/find-provides.libtool 2016-05-11 14:38:49.404192547 +0200 +@@ -2,9 +2,9 @@ + while read possible ; do + case "$possible" in + *.la) +- if grep -iq '^# Generated by ltmain.sh' "$possible" 2> /dev/null ; then +- echo "libtool($possible)" +- fi ++ if grep -Eiq '^# Generated by (libtool|ltmain.sh)' "$possible" 2> /dev/null ; then ++ echo "libtool($possible)" ++ fi + ;; + esac + done diff --git a/SOURCES/redhat-rpm-config-9.1.0-find-requires-fix-detection.patch b/SOURCES/redhat-rpm-config-9.1.0-find-requires-fix-detection.patch new file mode 100644 index 0000000..f35f74f --- /dev/null +++ b/SOURCES/redhat-rpm-config-9.1.0-find-requires-fix-detection.patch @@ -0,0 +1,15 @@ +--- current/find-requires.orig 2016-06-13 17:31:21.689322870 +0200 ++++ current/find-requires 2016-06-13 17:42:04.779855644 +0200 +@@ -21,10 +21,10 @@ + # --- Grab the file manifest and classify files. + #filelist=`sed "s/['\"]/\\\&/g"` + filelist=`sed "s/[]['\"*?{}]/\\\\\&/g"` +-exelist=`echo $filelist | xargs -r file | egrep -v ":.* (commands|script) " | \ ++exelist=`echo $filelist | xargs -r file | egrep -v ":.* (commands|script)[, ]" | \ + grep ":.*executable" | cut -d: -f1` + scriptlist=`echo $filelist | xargs -r file | \ +- egrep ":.* (commands|script) " | cut -d: -f1` ++ egrep ":.* (commands|script)[, ]" | cut -d: -f1` + liblist=`echo $filelist | xargs -r file | \ + grep ":.*shared object" | cut -d : -f1` + diff --git a/SOURCES/redhat-rpm-config-9.1.0-ppc64le.patch b/SOURCES/redhat-rpm-config-9.1.0-ppc64le.patch index 479896d..023694f 100644 --- a/SOURCES/redhat-rpm-config-9.1.0-ppc64le.patch +++ b/SOURCES/redhat-rpm-config-9.1.0-ppc64le.patch @@ -25,7 +25,7 @@ optflags: ppciseries %{__global_cflags} -m32 optflags: ppcpseries %{__global_cflags} -m32 optflags: ppc64 %{__global_cflags} -m64 -mcpu=power7 -mtune=power7 -+optflags: ppc64le %{__global_cflags} -m64 -mcpu=power7 -mtune=power8 ++optflags: ppc64le %{__global_cflags} -m64 -mcpu=power8 -mtune=power8 optflags: ppc64iseries %{__global_cflags} -m64 optflags: ppc64pseries %{__global_cflags} -m64 optflags: ppc8260 %{__global_cflags} -m32 diff --git a/SOURCES/redhat-rpm-config-9.1.0-repack-jars.patch b/SOURCES/redhat-rpm-config-9.1.0-repack-jars.patch new file mode 100644 index 0000000..3461d34 --- /dev/null +++ b/SOURCES/redhat-rpm-config-9.1.0-repack-jars.patch @@ -0,0 +1,21 @@ +--- redhat-rpm-config-9.1.0/brp-java-repack-jars.orig 2016-05-11 16:19:41.026993150 +0200 ++++ redhat-rpm-config-9.1.0/brp-java-repack-jars 2016-05-11 16:22:14.621444942 +0200 +@@ -28,6 +28,8 @@ + OLD_IFS="$IFS" + IFS=$(printf '\n\t') + for j in $JARS ; do ++ JAROWN=`ls -l $j | cut -d' ' -f3` ++ JARGRP=`ls -l $j | cut -d' ' -f4` + JARNAME=`basename "$j"` + JTMPDIR=`mktemp -d -p $RPM_BUILD_ROOT/tmp "$JARNAME.tmpdir.XXXXXXXXXX"` || exit 1 + JARDIR=`mktemp -d -p $RPM_BUILD_ROOT/tmp "$JARNAME.jardir.XXXXXXXXXX"` || exit 1 +@@ -91,6 +93,9 @@ + fi + popd > /dev/null + ++ chown $JAROWN $j ++ chgrp $JARGRP $j ++ + # Cleanup. + rm -rf "$JTMPDIR" + rm -rf "$JARDIR" diff --git a/SPECS/redhat-rpm-config.spec b/SPECS/redhat-rpm-config.spec index d4c82ed..d796229 100644 --- a/SPECS/redhat-rpm-config.spec +++ b/SPECS/redhat-rpm-config.spec @@ -1,7 +1,7 @@ -Summary: CentOS specific rpm configuration files +Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config Version: 9.1.0 -Release: 68%{?dist} +Release: 72%{?dist} # No version specified. License: GPL+ Group: Development/System @@ -83,9 +83,22 @@ Patch30: redhat-rpm-config-9.1.0-perfbuild.patch Patch31: redhat-rpm-config-9.1.0-use-kverrel-for-kmodtool.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1126086 Patch32: redhat-rpm-config-9.1.0-fix-kabi-path.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1179523 +Patch33: redhat-rpm-config-9.0.3-shebang.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1250015 +Patch34: redhat-rpm-config-9.1.0-Fix-stripping-of-binaries.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1061619 +Patch35: redhat-rpm-config-9.1.0-find-provides.libtool.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1270053 +Patch36: redhat-rpm-config-9.1.0-repack-jars.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1323087 +Patch37: redhat-rpm-config-9.0.3-latest-kernel.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1057327 +Patch38: redhat-rpm-config-9.1.0-Add-_pkgdocdir.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1324003 +Patch39: redhat-rpm-config-9.1.0-find-requires-fix-detection.patch # ppc64 little endian support Patch99: redhat-rpm-config-9.1.0-ppc64le.patch -Patch100: redhat-rpm-config-9.1.0-centos.dist.patch BuildArch: noarch Requires: coreutils @@ -96,7 +109,7 @@ Requires: zip Provides: system-rpm-config = %{version}-%{release} %description -CentOS specific rpm configuration files. +Red Hat specific rpm configuration files. %prep %setup -q @@ -133,9 +146,15 @@ CentOS specific rpm configuration files. %patch30 -p1 %patch31 -p1 %patch32 -p1 +%patch33 -p1 +%patch34 -p1 +%patch35 -p1 +%patch36 -p1 +%patch37 -p1 +%patch38 -p1 +%patch39 -p1 %patch99 -p2 -%patch100 -p1 %build @@ -164,8 +183,24 @@ rm -rf ${RPM_BUILD_ROOT} %{_sysconfdir}/rpm/* %changelog -* Thu Mar 05 2015 CentOS Sources - 9.1.0-68.el7.centos -- update check_rhl function in dist.sh +* Mon Aug 29 2016 Florian Festi - 9.1.0-72 +- Rebuild for fixed _docdir_fmt + +* Thu Jul 28 2016 Florian Festi - 9.1.0-71 +- Set _docdir_fmt macro to old default (#1057327) + +* Tue Jul 26 2016 Florian Festi - 9.1.0-70 +- Be stricter with she bang lines in find-requires (#1179523) +- Use --with-cpu=power8 for ppc64le (#1213268) +- Fix stripping of binaries for changed file output (#1250015) +- Fix find-provides.libtool for new libtool style (#1061619) +- Restore UID/ GID on jar files (#1270053) +- Fix latest_kernel macro (#1323087) +- Add _pkgdocdir and _docdir_fmt macro (#1057327) +- Fix detection for perl files in old depencency generator (#1324003) + +* Tue Dec 08 2015 Yaakov Selkowitz - 9.1.0-69 +- Add aarch64 and ppc64le to ghc, ocaml, and GNAT arches (#1193178) * Wed Nov 12 2014 Weiping Pan - 9.1.0-68 - fix kabi path (#1126086)