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.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2015-11-22 21:32:25 -05:00
parent a8dd73e98a
commit 62fe3c2ff7

View File

@ -1,7 +1,7 @@
Summary: A mouse server for the Linux console Summary: A mouse server for the Linux console
Name: gpm Name: gpm
Version: 1.20.7 Version: 1.20.7
Release: 7%{?dist} Release: 8%{?dist}
License: GPLv2 and GPLv2+ with exceptions and GPLv3+ and Verbatim and Copyright only License: GPLv2 and GPLv2+ with exceptions and GPLv3+ and Verbatim and Copyright only
Group: System Environment/Daemons Group: System Environment/Daemons
URL: http://www.nico.schottelius.org/software/gpm/ 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 || : /sbin/install-info %{_infodir}/gpm.info.gz %{_infodir}/dir || :
fi fi
%ifnarch s390 s390x
%triggerun -- gpm < 1.20.6-15
/bin/systemctl enable gpm.service >/dev/null 2>&1 || :
%endif
%preun %preun
%ifnarch s390 s390x %ifnarch s390 s390x
%systemd_preun gpm.service %systemd_preun gpm.service
@ -147,11 +142,6 @@ fi
%systemd_postun_with_restart gpm.service %systemd_postun_with_restart gpm.service
%endif %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 %post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig
@ -179,6 +169,9 @@ fi
%{_libdir}/libgpm.a %{_libdir}/libgpm.a
%changelog %changelog
* Mon Nov 23 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.20.7-8
- Drop old scriptlets causing FTBFS with new rpm
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.20.7-7 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.20.7-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild