rpms
/
redhat-rpm-config
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- unbreak find-requires again, doh (#564527)

This commit is contained in:
Panu Matilainen 2010-02-15 11:49:10 +00:00
parent f17b98976e
commit cc13fe8402
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
redhat-rpm-config-9.1.0-fix-requires.patch Normal file
View File

@ -0,0 +1,31 @@
commit 635437c7bfe6053dcfe112705b809bb78aba1a73
Author: Panu Matilainen <pmatilai@redhat.com>
Date: Mon Feb 15 13:42:36 2010 +0200
Unbreak find-requires (#443015, #564527)
- regression originating from commit 9ed9b4e3459e3125befd324f579f751a239c26ca
which was supposed to fix something for on ARM but broke pretty much
all else
- this should've been in 9.1.0 but somehow gone missing, ugh...
- fix originally from Bill Nottingham
diff --git a/find-requires b/find-requires
index fa5ab95..eb3ee54 100755
--- a/find-requires
+++ b/find-requires
@@ -106,6 +106,7 @@ for f in $liblist $exelist ; do
print $2 ;
}
}
+ (START==2) && /^[A-Za-z]/ { START=3; }
/^Version References:$/ { START=2; }
(START==2) && /required from/ {
sub(/:/, "", $3);
@@ -114,7 +115,6 @@ for f in $liblist $exelist ; do
(START==2) && (LIBNAME!="") && ($4!="") {
print LIBNAME "(" $4 ")'$lib64'";
}
- /^[A-Za-z]/ { START=3; }
'
done | sort -u

7
redhat-rpm-config.spec
View File

@ -1,13 +1,14 @@
Summary: Red Hat specific rpm configuration files
Name: redhat-rpm-config
Version: 9.1.0
Release: 2%{?dist}
Release: 3%{?dist}
# No version specified.
License: GPL+
Group: Development/System
URL: http://git.fedoraproject.org/git/redhat-rpm-config
Source: redhat-rpm-config-%{version}.tar.bz2
Patch0: redhat-rpm-config-9.1.0-strict-python-bytecompile.patch
Patch1: redhat-rpm-config-9.1.0-fix-requires.patch
BuildArch: noarch
Requires: mktemp
Requires: rpm >= 4.6.0
@ -20,6 +21,7 @@ Red Hat specific rpm configuration files.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
@ -39,6 +41,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_prefix}/lib/rpm/redhat
%changelog
* Mon Feb 15 2010 Panu Matilainen <pmatilai@redhat.com> - 9.1.0-3
- unbreak find-requires again, doh (#564527)
* Wed Feb 3 2010 Panu Matilainen <pmatilai@redhat.com> - 9.1.0-2
- python byte-compilation errors abort the build by default