- PLD merge

diff --git a/poldek-aliases.conf b/poldek-aliases.conf
index c5809daeef7b35d3526eb7ad6877f07c2f1fb61a..649f0b12787420f41a64111617814ab091eef8a1 100644 (file)
--- a/poldek-aliases.conf
+++ b/poldek-aliases.conf
@@ -18,13 +18,14 @@ freshen = install -FN
 upgrade = install -F
 
 # for backward compatybility, greedy is on by default now
 upgrade = install -F
 
 # for backward compatybility, greedy is on by default now

-greedy-upgrade = install -FG
+greedy-upgrade = install -Fg

 
 just-install = install -IN
 
 # search
 what-requires = search -r
 what-provides = search -p
 
 just-install = install -IN
 
 # search
 what-requires = search -r
 what-provides = search -p

+what-suggests = search -S

 rsearch = search --perlre
 
 exit = quit
 rsearch = search --perlre
 
 exit = quit

diff --git a/poldek.spec b/poldek.spec
index 4241ad69b5fca11a64ef7951552bca68e83445d6..74bac3f3bac2f4d67057806a8a328c2f111ed17c 100644 (file)
--- a/poldek.spec
+++ b/poldek.spec
@@ -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
 Summary(pl.UTF-8):     Pomocnicze narzędzie do zarządzania pakietami RPM
 Name:          poldek
 Version:       0.42.2

-Release:       3
+Release:       4

 License:       GPL v2
 Group:         Applications/System
 #Source0:      http://poldek.pld-linux.org/download/snapshots/%{name}-%{version}-cvs%{snap}.tar.bz2
 License:       GPL v2
 Group:         Applications/System
 #Source0:      http://poldek.pld-linux.org/download/snapshots/%{name}-%{version}-cvs%{snap}.tar.bz2


@@ -46,6 +46,7 @@ Patch10:      rpm4-cpuinfo-deps.patch
 Patch11:       rpm4-no-dir-deps.patch
 Patch12:       rpm4-rpmvercmp.patch
 Patch13:       trurlib-shared.patch
 Patch11:       rpm4-no-dir-deps.patch
 Patch12:       rpm4-rpmvercmp.patch
 Patch13:       trurlib-shared.patch

+Patch14:       rpm4-script-req-workaround.patch

 URL:           http://poldek.pld-linux.org/
 BuildRequires: %{db_pkg}-devel >= %{ver_db}
 BuildRequires: autoconf >= 2.63
 URL:           http://poldek.pld-linux.org/
 BuildRequires: %{db_pkg}-devel >= %{ver_db}
 BuildRequires: autoconf >= 2.63


@@ -230,6 +231,7 @@ Moduły języka Python dla poldka.
 cd trurlib
 %patch13 -p1
 cd ..
 cd trurlib
 %patch13 -p1
 cd ..

+%patch14 -p1

 
 %{__rm} doc/poldek.info
 %{__rm} m4/libtool.m4 m4/lt*.m4
 
 %{__rm} doc/poldek.info
 %{__rm} m4/libtool.m4 m4/lt*.m4

diff --git a/rpm4-script-req-workaround.patch b/rpm4-script-req-workaround.patch
new file mode 100644 (file)
index 0000000..9f75d75
--- /dev/null
+++ b/rpm4-script-req-workaround.patch
@@ -0,0 +1,17 @@
+--- poldek-0.42.2/pm/rpmorg/rpm_pkg_ld.c~      2020-03-26 16:54:55.000000000 +0100
++++ poldek-0.42.2/pm/rpmorg/rpm_pkg_ld.c       2021-01-11 00:29:34.123702919 +0100
+@@ -71,12 +71,13 @@
+ 
+     else
+ #endif
++/*
+         if (isInstallPreReq(rpmflags))
+             rflags |= CAPREQ_PREREQ;
+ 
+     if (isErasePreReq(rpmflags))
+         rflags |= CAPREQ_PREREQ_UN;
+-
++*/
+     DBGFIF(rflags & (CAPREQ_PREREQ | CAPREQ_PREREQ_UN),
+            "(%s, %s)\n",
+            rflags & CAPREQ_PREREQ ? "pre":"",