[packages/poldek] Up to 0.46.0 git snapshot b9ebbbaf with trurlib 599f369 and tndb 5184ad2

Sun Oct 25 21:23:24 CET 2026

commit 806a49040b2790a418644189b31a2561945ae4c0
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun Oct 25 21:21:54 2026 +0100

    Up to 0.46.0 git snapshot b9ebbbaf with trurlib 599f369 and tndb 5184ad2
    
    poldek runs the hooks from /etc/poldek/{pre,post}-install.d itself now ("hooks dir"),
    once per operation

 pm-hooks.patch | 81 ++++++++++++++++++++++------------------------------------
 poldek.spec    | 28 +++++++++-----------
 2 files changed, 43 insertions(+), 66 deletions(-)
---

diff --git a/poldek.spec b/poldek.spec
index 9d2d1e3..2a3781b 100644
--- a/poldek.spec
+++ b/poldek.spec
@@ -22,12 +22,12 @@
 %define		ver_rpm		1:4.14
 %endif
 
-%define		gitref	02e02fb938d1e4c8228012d4d1f1c90aa7d26832
-%define		snap	20261023
+%define		gitref	b9ebbbaf1ca8cd78dfc1dc10513b9ae51d468499
+%define		snap	20261025
 %define		rel	0.1
 # poldek's autogen.sh and CI build against trurlib and tndb master
-%define		trurlib_gitref	c8c3443df37a175f68ac9f0c55978dbb6d238c33
-%define		tndb_gitref	80e426fe181798cc2780e6ca18f30ad8b69297b0
+%define		trurlib_gitref	599f369f61bd974991158c02fe306cbebadc46d3
+%define		tndb_gitref	5184ad2892fc99f9dc084e879f55673c55fb3e96
 Summary:	RPM packages management helper tool
 Summary(hu.UTF-8):	RPM csomagkezelést segítő eszköz
 Summary(pl.UTF-8):	Pomocnicze narzędzie do zarządzania pakietami RPM
@@ -37,7 +37,7 @@ Release:	0.%{snap}.%{rel}%{?with_snap:.%{SNAP}}
 License:	GPL v2
 Group:		Applications/System
 Source0:	https://github.com/poldek-pm/poldek/archive/%{gitref}/%{name}-%{snap}.tar.gz
-# Source0-md5:	d5b585755b7683948894f378a7345ea6
+# Source0-md5:	756bef94079fa0dd6bea820d60478b34
 Source1:	%{name}.conf
 Source2:	%{name}-multilib.conf
 Source3:	%{name}-config.sh
@@ -50,9 +50,9 @@ Source9:	%{name}-aidath.conf
 Source10:	%{name}-multilib-aidath.conf
 Source11:	%{name}-archive.conf
 Source12:	https://github.com/poldek-pm/trurlib/archive/%{trurlib_gitref}/trurlib-%{trurlib_gitref}.tar.gz
-# Source12-md5:	bc8baff5e9c04e59e468b1284e2ae341
+# Source12-md5:	7be1e84112288e9902272b5ea6c7dc4c
 Source13:	https://github.com/poldek-pm/tndb/archive/%{tndb_gitref}/tndb-%{tndb_gitref}.tar.gz
-# Source13-md5:	250fc79aed3258dfa6c336a40d571978
+# Source13-md5:	6b48cda593069862624a98312934d973
 Source100:	%{name}-snap.conf
 Source101:	%{name}-multilib-snap.conf
 Source102:	%{name}-debuginfo-snap.conf
@@ -114,7 +114,6 @@ Requires:	%{db_pkg} >= %{ver_db}
 Requires:	rpm-db-ver = %{ver_db}
 %endif
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	/bin/run-parts
 Requires:	rpm >= %{ver_rpm}
 Requires:	rpm-lib >= %{ver_rpm}
 Requires:	sed
@@ -466,7 +465,7 @@ fi
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
-%triggerpostun -- poldek < 0.30.1-8
+%triggerpostun -- poldek < 0.46.0-0.20261025.0.1
 # poldek < 0.30-0.20080225.00.1
 if ! grep -q '^%%includedir repos.d' %{_sysconfdir}/%{name}/poldek.conf; then
 	%{__sed} -i -e '/^%%include source.conf/{
@@ -499,13 +498,11 @@ if [ -f %{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}-multilib.conf.rpmsave ]; then
 	%{__mv} -f %{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}-%{ftp_alt_arch}.conf{,.rpmnew}
 	%{__mv} -v %{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}-multilib.conf.rpmsave %{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}-%{ftp_alt_arch}.conf
 fi
-# poldek < 0.30.1-8
-if [ $1 -le 1 ]; then
-	# revert change on  --downgrade
-	%{__sed} -i -re 's,^pm command = %{pkglibexecdir}/pm-command.sh,#&,' %{_sysconfdir}/%{name}/%{name}.conf
+# poldek < 0.46.0-0.20261025.0.1 ran the hooks through a "pm command" wrapper
+if grep -q '^hooks dir' %{_sysconfdir}/%{name}/%{name}.conf; then
+	%{__sed} -i -e 's,^pm command = %{pkglibexecdir}/pm-command.sh$,#&,' %{_sysconfdir}/%{name}/%{name}.conf
 else
-	# setup pm command
-	%{__sed} -i -re 's,#?(pm command =).*,\1 %{pkglibexecdir}/pm-command.sh,' %{_sysconfdir}/%{name}/%{name}.conf
+	%{__sed} -i -e 's,^pm command = %{pkglibexecdir}/pm-command.sh$,hooks dir = %{_sysconfdir}/%{name},' %{_sysconfdir}/%{name}/%{name}.conf
 fi
 
 %files -f %{name}.lang
@@ -524,7 +521,6 @@ fi
 %attr(755,root,root) %{_bindir}/poldek-config
 %attr(755,root,root) %{_bindir}/rpmvercmp
 %dir %{pkglibexecdir}
-%attr(755,root,root) %{pkglibexecdir}/pm-command.sh
 %attr(755,root,root) %{pkglibexecdir}/poldekuser-setup.sh
 %attr(755,root,root) %{pkglibexecdir}/vfcompr
 %attr(755,root,root) %{pkglibexecdir}/vfjuggle
diff --git a/pm-hooks.patch b/pm-hooks.patch
index 7029b59..d92ff04 100644
--- a/pm-hooks.patch
+++ b/pm-hooks.patch
@@ -1,44 +1,10 @@
-this could be handled natively by poldek
-but implement as "pm command" hack for now
+PLD runs etckeeper and other hooks from /etc/poldek/{pre,post}-install.d.
 
---- /dev/null	2015-05-20 12:11:30.089022100 +0300
-+++ poldek/scripts/pm-command.sh	2015-05-31 18:21:15.748917981 +0300
-@@ -0,0 +1,11 @@
-+#!/bin/sh
-+# wrapper to add pre-install.d and post-install.d support for pm command in poldek
-+
-+/bin/run-parts /etc/poldek/pre-install.d
-+
-+/bin/rpm "$@"
-+rc=$?
-+
-+/bin/run-parts /etc/poldek/post-install.d
-+
-+exit $rc
---- /dev/null	2015-05-20 12:11:30.089022100 +0300
-+++ poldek/conf/pre-install.d/README	2015-05-31 18:18:35.539100326 +0300
-@@ -0,0 +1,2 @@
-+Files in this directory are run before packages are installed, upgraded,
-+etc.
---- /dev/null	2015-05-20 12:11:30.089022100 +0300
-+++ poldek/conf/post-install.d/README	2015-05-31 18:18:45.883922914 +0300
-@@ -0,0 +1 @@
-+Files in this directory are run after packages are installed, upgraded, etc.
---- poldek-0.30.1/conf/poldek.conf~	2015-05-31 18:25:35.000000000 +0300
-+++ poldek-0.30.1/conf/poldek.conf	2015-05-31 18:26:28.410188923 +0300
-@@ -56,7 +56,7 @@
- #exclude path = 
- 
- # Full path name to a PM (rpm for now) binary.
--#pm command = /bin/rpm
-+pm command = /usr/lib/poldek/pm-command.sh
- 
- # Full path name to sudo binary.
- #sudo command = /usr/bin/sudo
---- poldek-0.30.1/conf/Makefile.am	2015-05-31 18:28:29.319806773 +0300
-+++ poldek-0.30.1/conf/Makefile.am	2015-05-31 19:12:22.206571793 +0300
+diff -Nur a/conf/Makefile.am b/conf/Makefile.am
+--- a/conf/Makefile.am	2026-10-25 20:33:16.000000000 +0100
++++ b/conf/Makefile.am	2026-10-25 21:14:51.730295076 +0100
 @@ -26,6 +26,10 @@
-
+ 
  install-data-local: $(GENCONFIGS)
  	 $(MKDIR_P) $(DESTDIR)$(sysconfdir)/$(PACKAGE)/repos.d
 +	 $(MKDIR_P) $(DESTDIR)$(sysconfdir)/$(PACKAGE)/pre-install.d
@@ -48,14 +14,29 @@ but implement as "pm command" hack for now
  	 for a in $(CONFIGS); do \
  	 	$(INSTALL_DATA) $(srcdir)/$$a $(DESTDIR)$(sysconfdir)/$(PACKAGE); \
  	 done
---- poldek-0.30.1/Makefile.am~	2014-03-26 00:32:25.000000000 +0200
-+++ poldek-0.30.1/Makefile.am	2015-05-31 19:10:22.240340180 +0300
-@@ -79,7 +79,7 @@
- LDADD_              = @INTLLIBS@
-
- vfscriptsdir = $(PKGLIBDIR)
--vfscripts_SCRIPTS = scripts/zlib-in-rpm.sh scripts/vfjuggle scripts/vfcompr scripts/vfsmb scripts/poldekuser-setup.sh
-+vfscripts_SCRIPTS = scripts/zlib-in-rpm.sh scripts/vfjuggle scripts/vfcompr scripts/vfsmb scripts/poldekuser-setup.sh scripts/pm-command.sh
-
- EXTRA_DIST = \
- 	     $(vfscripts_SCRIPTS) \
+diff -Nur a/conf/poldek.conf b/conf/poldek.conf
+--- a/conf/poldek.conf	2026-10-25 21:14:42.203896190 +0100
++++ b/conf/poldek.conf	2026-10-25 21:14:42.249524757 +0100
+@@ -70,7 +70,7 @@
+ # run in the order of their names. Hooks do not run for rpm test runs nor
+ # with a root directory other than /. Example:
+ # hooks dir = /etc/poldek
+-#hooks dir = 
++hooks dir = /etc/poldek
+ 
+ # Transaction summary style, can be 'old' (pre 0.4.0 version) or 'color' - coloured and compact.
+ #summary style = color
+diff -Nur a/conf/post-install.d/README b/conf/post-install.d/README
+--- a/conf/post-install.d/README	1970-01-01 01:00:00.000000000 +0100
++++ b/conf/post-install.d/README	2026-10-25 21:14:51.659260033 +0100
+@@ -0,0 +1,3 @@
++Executable files in this directory are run, in name order, after poldek
++has installed, upgraded or removed packages.
++See "hooks dir" in /etc/poldek/poldek.conf.
+diff -Nur a/conf/pre-install.d/README b/conf/pre-install.d/README
+--- a/conf/pre-install.d/README	1970-01-01 01:00:00.000000000 +0100
++++ b/conf/pre-install.d/README	2026-10-25 21:14:51.659260033 +0100
+@@ -0,0 +1,3 @@
++Executable files in this directory are run, in name order, before poldek
++installs, upgrades or removes packages; if one of them fails, poldek stops.
++See "hooks dir" in /etc/poldek/poldek.conf.
================================================================

---- gitweb:

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

