- fix rpm-namespace-probe.patch (change proper file)

diff --git a/rpm-namespace-probe.patch b/rpm-namespace-probe.patch
index 32a9f26914596cf00c4ce2a49d589060c3bf1300..acbfb4bf4ebfe0ef001d57b3a70f2b945a5c8c2e 100644 (file)
--- 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

diff --git a/rpm.spec b/rpm.spec
index a04bb696c3cc824e166817f24857fd4c303a8b2c..47f8b29d451741b474a58861dd5086f34269acc7 100644 (file)
--- 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