[packages/rpm] - make rpmlint happy - release 7

baggins baggins at pld-linux.org
Mon Sep 24 12:25:13 CEST 2012


commit 295c267a0fddc4562229555fc53e896a977150fc
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Sep 24 12:24:55 2012 +0200

    - make rpmlint happy
    - release 7

 rpm-python-enable-compat-RPMSENSE.patch | 11 +++++++++++
 rpm.spec                                |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/rpm.spec b/rpm.spec
index fbd3218..876d02b 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -48,7 +48,7 @@ Summary(ru.UTF-8):	Менеджер пакетов от RPM
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	5.4.10
-Release:	6
+Release:	7
 License:	LGPL
 Group:		Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm
@@ -133,6 +133,7 @@ Patch45:	%{name}-remove-misleading-missing-patch-message.patch
 Patch46:	%{name}-file-magic-can-be-mixed-case.patch
 Patch47:	%{name}-query-file-always-noisy.patch
 Patch48:	%{name}-verify-ghosts-broken-logic.patch
+Patch49:	%{name}-python-enable-compat-RPMSENSE.patch
 
 # Patches imported from Mandriva
 
@@ -807,6 +808,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch46 -p1
 %patch47 -p1
 %patch48 -p1
+%patch49 -p1
 
 %patch1000 -p1
 %patch1001 -p1
diff --git a/rpm-python-enable-compat-RPMSENSE.patch b/rpm-python-enable-compat-RPMSENSE.patch
new file mode 100644
index 0000000..e3b7701
--- /dev/null
+++ b/rpm-python-enable-compat-RPMSENSE.patch
@@ -0,0 +1,11 @@
+--- rpm-5.4.10/python/rpmmodule.c~	2012-04-25 22:41:43.000000000 +0200
++++ rpm-5.4.10/python/rpmmodule.c	2012-09-24 12:22:53.535610753 +0200
+@@ -493,7 +493,7 @@
+     REGISTER_ENUM(RPMSENSE_EQUAL);
+     REGISTER_ENUM(RPMSENSE_NOTEQUAL);
+     REGISTER_ENUM(RPMSENSE_FIND_REQUIRES);
+-#if defined(RPM_VENDOR_MANDRIVA)
++#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_PLD)
+     REGISTER_ENUM(RPMSENSE_PREREQ);
+     REGISTER_ENUM(RPMSENSE_SCRIPT_PRE);
+     REGISTER_ENUM(RPMSENSE_SCRIPT_POST);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/295c267a0fddc4562229555fc53e896a977150fc



More information about the pld-cvs-commit mailing list