From 8cb891e86ee5f256d0e3403966090eefe02b9e27 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Mon, 12 Oct 2020 01:16:23 +0200 Subject: [PATCH] - rpm.org does not support R(trigger*) and multiple triggers for the same prog --- pm-hooks.patch | 6 +++--- poldek.spec | 8 +++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pm-hooks.patch b/pm-hooks.patch index 193addf..7029b59 100644 --- a/pm-hooks.patch +++ b/pm-hooks.patch @@ -27,12 +27,12 @@ but implement as "pm command" hack for now --- 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 = - + #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 diff --git a/poldek.spec b/poldek.spec index 2f23bb3..ef86d5a 100644 --- a/poldek.spec +++ b/poldek.spec @@ -102,8 +102,8 @@ BuildRequires: rpm-static BuildRequires: zlib-static BuildRequires: zstd-static %endif -Requires(triggerpostun): awk -Requires(triggerpostun): sed >= 4.0 +Requires(postun): awk +Requires(postun): sed >= 4.0 %if %{with rpm4} Requires: %{db_pkg} >= %{ver_db_devel} %else @@ -455,7 +455,7 @@ fi %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig -%triggerpostun -- poldek < 0.30-0.20080225.00.1 +%triggerpostun -- poldek < 0.30.1-8 if ! grep -q '^%%includedir repos.d' %{_sysconfdir}/%{name}/poldek.conf; then %{__sed} -i -e '/^%%include source.conf/{ a @@ -479,7 +479,6 @@ if [ -f %{_sysconfdir}/%{name}/pld-multilib-source.conf.rpmsave ]; then fi %endif -%triggerpostun -- poldek < 0.30.1-3 if [ -f %{_sysconfdir}/%{name}/repos.d/pld-multilib.conf.rpmsave ]; then %{__mv} -f %{_sysconfdir}/%{name}/repos.d/pld-%{ftp_alt_arch}.conf{,.rpmnew} %{__mv} -v %{_sysconfdir}/%{name}/repos.d/pld-multilib.conf.rpmsave %{_sysconfdir}/%{name}/repos.d/pld-%{ftp_alt_arch}.conf @@ -489,7 +488,6 @@ if [ -f %{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}-multilib.conf.rpmsave ]; then %{__mv} -v %{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}-multilib.conf.rpmsave %{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}-%{ftp_alt_arch}.conf fi -%triggerpostun -- %{name} < 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 -- 2.44.0