[packages/rpm] - fix rpm-namespace-probe.patch (change proper file)
baggins
baggins at pld-linux.org
Tue Sep 11 14:39:48 CEST 2012
commit c978445ade9730560fd4c026068b8f7097860b48
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Tue Sep 11 14:39:28 2012 +0200
- fix rpm-namespace-probe.patch (change proper file)
rpm-namespace-probe.patch | 8 ++++----
rpm.spec | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index a04bb69..47f8b29 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -55,7 +55,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM
Summary(uk.UTF-8): Менеджер пакетів від RPM
Name: rpm
Version: 5.4.10
-Release: 0.12
+Release: 0.13
License: LGPL
Group: Base
# http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm
diff --git a/rpm-namespace-probe.patch b/rpm-namespace-probe.patch
index 32a9f26..acbfb4b 100644
--- a/rpm-namespace-probe.patch
+++ b/rpm-namespace-probe.patch
@@ -12,7 +12,7 @@ as for example uninstalling this spec: https://bugs.pld-linux.org/attachment.cgi
goto exit;
}
-+#if 0
++#if !defined(RPM_VENDOR_PLD)
/* Evaluate user/group lookup probes. */
if (NSType == RPMNS_TYPE_USER) {
const char *s;
@@ -24,13 +24,13 @@ as for example uninstalling this spec: https://bugs.pld-linux.org/attachment.cgi
/* Evaluate access(2) probe dependencies. */
if (NSType == RPMNS_TYPE_ACCESS) {
---- rpm-4.4.9/lib/order.c~ 2007-05-16 14:31:58.000000000 +0300
-+++ rpm-4.4.9/lib/order.c 2008-04-25 15:36:20.223855745 +0300
+--- rpm-4.4.9/rpmdb/rpmns.c~ 2007-05-16 14:31:58.000000000 +0300
++++ rpm-4.4.9/rpmdb/rpmns.c 2008-04-25 15:36:20.223855745 +0300
@@ -179,8 +179,10 @@
case RPMNS_TYPE_UNAME:
case RPMNS_TYPE_SONAME:
case RPMNS_TYPE_ACCESS:
-+#if 0
++#if !defined(RPM_VENDOR_PLD)
case RPMNS_TYPE_USER:
case RPMNS_TYPE_GROUP:
+#endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/c978445ade9730560fd4c026068b8f7097860b48
More information about the pld-cvs-commit
mailing list