- workarond for https://github.com/poldek-pm/poldek/issues/17 - treat

  script reqa (pre/post, etc) as regular R, same as rpm5 generated

diff --git a/poldek.spec b/poldek.spec
index 329848b64173eb5b3e1914e931becb9d6715f146..e9ed27e359900d9e607e2ab253a1b27c33d333fc 100644 (file)
--- a/poldek.spec
+++ b/poldek.spec
@@ -65,6 +65,7 @@ Patch10:      rpm4-cpuinfo-deps.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
@@ -254,6 +255,7 @@ Moduły języka Python dla poldka.
 cd trurlib
 %patch13 -p1
 cd ..
+%patch14 -p1
 
 %{__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":"",