diff --git a/perl-python-attr.patch b/perl-python-attr.patch new file mode 100644 index 0000000..4d422e2 --- /dev/null +++ b/perl-python-attr.patch @@ -0,0 +1,32 @@ +commit 9ddcc23d2b7ecaf5336530dbe37195b0057d0396 +Author: Ville Skyttä +Date: Tue Jan 10 10:48:13 2012 +0200 + + Adapt perl and python fileattrs to file 5.10 magics + + - file 5.10 has changed magics at least for perl and python scripts, samples: + + 5.09: a /usr/bin/perl -w script, ASCII text executable, with very long lines + 5.10: Perl script, ASCII text executable, with very long lines + + 5.09: a /usr/bin/python script, ASCII text executable + 5.10: Python script, ASCII text executable + + Signed-off-by: Panu Matilainen + +--- fileattrs/perl.attr ++++ fileattrs/perl.attr 2012-01-16 14:09:35.455146647 +0000 +@@ -1,4 +1,4 @@ + # disabled for now + #%__perl_requires %{_rpmconfigdir}/perl.req +-%__perl_magic ^.*perl .*$ ++%__perl_magic ^.*[Pp]erl .*$ + %__perl_flags exeonly +--- fileattrs/python.attr ++++ fileattrs/python.attr 2012-01-16 14:09:35.455146647 +0000 +@@ -1,4 +1,4 @@ + %__python_provides %{_rpmconfigdir}/pythondeps.sh --provides + %__python_requires %{_rpmconfigdir}/pythondeps.sh --requires + %__python_path ^((/usr/lib(64)?/python[[:digit:]]\\.[[:digit:]]/.*\\.(py[oc]?|so))|(%{_bindir}/python[[:digit:]]\\.[[:digit:]]))$ +-%__python_magic ^python.*(executable|byte-compiled)$ ++%__python_magic ^[Pp]ython.*(executable|byte-compiled)$ diff --git a/rpm.changes b/rpm.changes index 7bff3de..2d55f48 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 16 14:12:58 UTC 2012 - werner@suse.de + +- Add patch from upstream to reflect changes of perl and python + fileattrs to file 5.10 magics + ------------------------------------------------------------------- Mon Jan 9 17:12:05 CET 2012 - dmueller@suse.de diff --git a/rpm.spec b/rpm.spec index ba047ef..a785f3d 100644 --- a/rpm.spec +++ b/rpm.spec @@ -123,6 +123,7 @@ Patch78: debugedit-stabs-warning.diff Patch79: headerchk.diff Patch80: rpm-deptracking.patch Patch81: python3-abi-kind.diff +Patch82: perl-python-attr.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # # avoid bootstrapping problem @@ -185,7 +186,7 @@ rm -f rpmdb/db.h %patch -P 50 -P 51 -P 52 -P 53 -P 54 -P 55 -P 56 -P 57 -P 58 -P 59 %patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69 %patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79 -%patch -P 80 -P 81 +%patch -P 80 -P 81 -P 82 #chmod 755 scripts/find-supplements{,.ksyms} #chmod 755 scripts/find-provides.ksyms scripts/find-requires.ksyms #chmod 755 scripts/firmware.prov