From 62fe3c2ff7ebc66ec705d1ded826b7eb86cf8b42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 22 Nov 2015 21:32:25 -0500 Subject: [PATCH] Drop old scriptlets causing FTBFS with new rpm rpm started failing during build when it detects overlapping triggers. It seems that this never worked reliably. Simply remove them altogether since there is not need to support upgrades from Fedora of 2011 vintage. https://bugzilla.redhat.com/show_bug.cgi?id=1246911 is similar. --- gpm.spec | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/gpm.spec b/gpm.spec index 92d5262..b9a5e44 100644 --- a/gpm.spec +++ b/gpm.spec @@ -1,7 +1,7 @@ Summary: A mouse server for the Linux console Name: gpm Version: 1.20.7 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2 and GPLv2+ with exceptions and GPLv3+ and Verbatim and Copyright only Group: System Environment/Daemons URL: http://www.nico.schottelius.org/software/gpm/ @@ -129,11 +129,6 @@ if [ -e %{_infodir}/gpm.info.gz ]; then /sbin/install-info %{_infodir}/gpm.info.gz %{_infodir}/dir || : fi -%ifnarch s390 s390x -%triggerun -- gpm < 1.20.6-15 -/bin/systemctl enable gpm.service >/dev/null 2>&1 || : -%endif - %preun %ifnarch s390 s390x %systemd_preun gpm.service @@ -147,11 +142,6 @@ fi %systemd_postun_with_restart gpm.service %endif -%triggerun -- gpm < 1.20.6-17 -%{_bindir}/systemd-sysv-convert --save gpm >/dev/null 2>&1 ||: -/bin/systemctl enable gpm.service >/dev/null 2>&1 -/bin/systemctl try-restart gpm.service >/dev/null 2>&1 || : - %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig @@ -179,6 +169,9 @@ fi %{_libdir}/libgpm.a %changelog +* Mon Nov 23 2015 Zbigniew Jędrzejewski-Szmek - 1.20.7-8 +- Drop old scriptlets causing FTBFS with new rpm + * Wed Jun 17 2015 Fedora Release Engineering - 1.20.7-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild