From 621c75fd0f20d7887348f61eef4ca2ece83a1ccc Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Aug 13 2009 17:24:04 +0000 Subject: - redhat-rpm-config-9.0.4-brpssa-speedup.patch: When looking for static archives, only run file(1) on files named *.a. (#517101) --- diff --git a/redhat-rpm-config-9.0.3-brpssa-speedup.patch b/redhat-rpm-config-9.0.3-brpssa-speedup.patch new file mode 100644 index 0000000..f3714ef --- /dev/null +++ b/redhat-rpm-config-9.0.3-brpssa-speedup.patch @@ -0,0 +1,12 @@ +diff -up redhat-rpm-config-9.0.3/brp-strip-static-archive.jx redhat-rpm-config-9.0.3/brp-strip-static-archive +--- redhat-rpm-config-9.0.3/brp-strip-static-archive.jx 2008-05-06 19:08:20.000000000 -0400 ++++ redhat-rpm-config-9.0.3/brp-strip-static-archive 2009-08-12 10:52:07.000000000 -0400 +@@ -8,7 +8,7 @@ fi + [ -z "$STRIP" ] && STRIP=strip + + # Strip static libraries. +-for f in `find $RPM_BUILD_ROOT -type f -a -exec file {} \; | \ ++for f in `find $RPM_BUILD_ROOT -name \*.a -a -exec file {} \; | \ + grep -v "^${RPM_BUILD_ROOT}/\?usr/lib/debug" | \ + grep 'current ar archive' | \ + sed -n -e 's/^\(.*\):[ ]*current ar archive/\1/p'`; do diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index 35d120b..887c0cf 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.0.3 -Release: 14%{?dist} +Release: 15%{?dist} # No version specified. License: GPL+ Group: Development/System @@ -14,6 +14,7 @@ Patch4: redhat-rpm-config-9.0.3-F-12-Architectures.patch Patch5: redhat-rpm-config-9.0.3-always_delete_buildroot_at_install.patch Patch6: redhat-rpm-config-9.0.3-xz-payload.patch Patch7: redhat-rpm-config-9.0.3-jars-with-spaces.patch +Patch8: redhat-rpm-config-9.0.3-brpssa-speedup.patch BuildArch: noarch Requires: mktemp BuildRoot: %{_tmppath}/%{name}-root @@ -31,6 +32,7 @@ Red Hat specific rpm configuration files. %patch5 -p1 %patch6 -p1 %patch7 -p5 +%patch8 -p1 %install make DESTDIR=${RPM_BUILD_ROOT} install @@ -43,6 +45,10 @@ rm -rf ${RPM_BUILD_ROOT} %{_prefix}/lib/rpm/redhat %changelog +* Thu Aug 13 2009 Adam Jackson 9.0.3-15 +- redhat-rpm-config-9.0.4-brpssa-speedup.patch: When looking for static + archives, only run file(1) on files named *.a. (#517101) + * Wed Aug 12 2009 Adam Jackson 9.0.3-14 - redhat-rpm-config-9.0.3-jars-with-spaces.patch: Handle repacking jars whose filenames contain spaces. (#461854)