- PLD merge

diff --git a/poldek.spec b/poldek.spec
index 0660271335c1c2381283705650ed67fca995fec7..d147239bfee9ea3c36b19fe83fb002c87c9e76c5 100644 (file)
--- a/poldek.spec
+++ b/poldek.spec
@@ -1,4 +1,4 @@
-# TODO:
+# TODO
 # - fix config having escaped html entities:
 #   # package A requires capability foo >= 1.0 while package B provides "foo"
 
@@ -19,7 +19,7 @@ Summary(hu.UTF-8):    RPM csomagkezelést segítő eszköz
 Summary(pl.UTF-8):     Pomocnicze narzędzie do zarządzania pakietami RPM
 Name:          poldek
 Version:       0.42.2
-Release:       4
+Release:       5
 License:       GPL v2
 Group:         Applications/System
 #Source0:      http://poldek.pld-linux.org/download/snapshots/%{name}-%{version}-cvs%{snap}.tar.bz2

diff --git a/rpm4-no-dir-deps.patch b/rpm4-no-dir-deps.patch
index ae6db7def843c39e54221903bea4d160f59f75cc..f05ee0d19ee6aeb061bc25eef77e0f38d598f33c 100644 (file)
--- a/rpm4-no-dir-deps.patch
+++ b/rpm4-no-dir-deps.patch
@@ -19,3 +19,32 @@
      
  (void *(*)(void *, void *, const char *, const char *, mode_t, tn_hash *))pm_rpm_opendb,
      (void (*)(void *))pm_rpm_closedb,
+--- poldek-0.42.2/lib_init.c.orig      2020-03-16 21:23:10.000000000 +0100
++++ poldek-0.42.2/lib_init.c   2021-02-12 19:32:47.579273016 +0100
+@@ -1433,8 +1433,9 @@
+                     break;
+ 
+                 case POLDEK_OP_AUTODIRDEP:
++#if !defined(HAVE_RPMDSUNAME) || defined(HAVE_RPMORG)
+                     v = 0;
+-#ifdef HAVE_RPMDSUNAME          /* rpmdsUname - rpm 4.4.6  */
++#else          /* rpmdsUname - rpm 4.4.6  */
+                     v = 1;
+ #endif
+                     break;
+--- poldek-0.42.2/conf_sections.c~     2020-01-25 23:10:38.000000000 +0100
++++ poldek-0.42.2/conf_sections.c      2021-02-13 18:32:16.569364907 +0100
+@@ -214,9 +214,13 @@
+              0, { 0 } },
+              
+    { "auto directory dependencies", 
++#if defined(HAVE_RPMORG)
++     CONF_TYPE_BOOLEAN3 | CONF_TYPE_F_OBSL, NULL, 0, { 0 } },
++#else
+      CONF_TYPE_BOOLEAN3,
+              "auto",
+              POLDEK_OP_AUTODIRDEP, { 0 } },
++#endif
+              
+    { "follow", 
+      CONF_TYPE_BOOLEAN,