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