[packages/poldek] - workarond for https://github.com/poldek-pm/poldek/issues/17 - treat script reqa (pre/post, etc)

baggins baggins at pld-linux.org
Mon Jan 11 00:56:14 CET 2021


commit d6ddb2670e8bf54a73b4c4aa36dba8cbf5ba305b
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Jan 11 00:53:14 2021 +0100

    - workarond for https://github.com/poldek-pm/poldek/issues/17 - treat
      script reqa (pre/post, etc) as regular R, same as rpm5 generated

 poldek.spec                      |  2 ++
 rpm4-script-req-workaround.patch | 17 +++++++++++++++++
 2 files changed, 19 insertions(+)
---
diff --git a/poldek.spec b/poldek.spec
index 329848b..e9ed27e 100644
--- 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
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":"",
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/poldek.git/commitdiff/d6ddb2670e8bf54a73b4c4aa36dba8cbf5ba305b



More information about the pld-cvs-commit mailing list