[packages/rpm] use correct string returned by file for Perl scripts

draenog draenog at pld-linux.org
Tue Oct 7 17:59:44 CEST 2014


commit 9d486499dc83722e4bd7ee4a05a5e7025b46b2c0
Author: Kacper Kornet <draenog at pld-linux.org>
Date:   Tue Oct 7 16:57:38 2014 +0100

    use correct string returned by file for Perl scripts

 rpm-perl-magic.patch | 11 +++++++++++
 rpm.spec             |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/rpm.spec b/rpm.spec
index e8e15a4..d4ae0e6 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -50,7 +50,7 @@ Summary(ru.UTF-8):	Менеджер пакетов от RPM
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	5.4.14
-Release:	5
+Release:	6
 License:	LGPL v2.1
 Group:		Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.14-0.20131024.src.rpm
@@ -165,6 +165,7 @@ Patch77:	%{name}-lua-expat.patch
 Patch78:	%{name}-double_check_unpackaged_subdirs.patch
 Patch79:	%{name}-rpmspec.patch
 Patch80:	%{name}-revert-gpg-argv-parsing.patch
+Patch81:	%{name}-perl-magic.patch
 
 # Patches imported from Mandriva
 
@@ -920,6 +921,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch78 -p1
 %patch79 -p1
 %patch80 -p1
+%patch81 -p0
 
 %patch1000 -p1
 %patch1001 -p1
diff --git a/rpm-perl-magic.patch b/rpm-perl-magic.patch
new file mode 100644
index 0000000..4352d1b
--- /dev/null
+++ b/rpm-perl-magic.patch
@@ -0,0 +1,11 @@
+--- lib/rpmfc.c.orig	2014-10-07 15:53:03.185631053 +0100
++++ lib/rpmfc.c	2014-10-07 16:02:32.487591097 +0100
+@@ -593,7 +593,7 @@
+ 
+   { "Desktop Entry",		RPMFC_DESKTOP_FILE|RPMFC_INCLUDE },
+ 
+-  { "perl script text",		RPMFC_PERL|RPMFC_INCLUDE },
++  { "Perl script",		RPMFC_PERL|RPMFC_INCLUDE },
+   { "Perl5 module source text", RPMFC_PERL|RPMFC_MODULE|RPMFC_INCLUDE },
+ 
+   { "PHP script text",		RPMFC_PHP|RPMFC_INCLUDE },
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/9d486499dc83722e4bd7ee4a05a5e7025b46b2c0



More information about the pld-cvs-commit mailing list