diff --git a/jetty.spec b/jetty.spec index 4e78030..d5afcd0 100644 --- a/jetty.spec +++ b/jetty.spec @@ -50,7 +50,7 @@ Name: jetty Version: 9.4.8 -Release: 1%{addver}%{?dist} +Release: 2%{addver}%{?dist} Summary: Java Webserver and Servlet Container # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt @@ -132,7 +132,7 @@ BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-test-policy) #BuildRequires: mvn(org.eclipse.jetty.toolchain.setuid:jetty-setuid-java) BuildRequires: maven-javadoc-plugin BuildRequires: glassfish-el -BuildRequires: systemd-units +BuildRequires: systemd # duplicate providers, choose one BuildRequires: jboss-websocket-1.0-api @@ -201,9 +201,7 @@ Requires: %{name}-http2-http-client-transport = %{version}-%{release} Requires: %{name}-http2-server = %{version}-%{release} Requires(pre): shadow-utils -Requires(post): systemd-units, systemd-sysv -Requires(preun): systemd-units -Requires(postun): systemd-units +%{?systemd_ordering} Provides: group(%username) = %jtuid @@ -882,16 +880,6 @@ exit 0 %systemd_postun_with_restart jetty.service -%triggerun -- jetty < 8.1.0-3 -# Save the current service runlevel info -# User must manually run systemd-sysv-convert --apply httpd -# to migrate them to systemd targets -/usr/bin/systemd-sysv-convert --save jetty >/dev/null 2>&1 ||: - -# Run these because the SysV package being removed won't do them -/sbin/chkconfig --del jetty >/dev/null 2>&1 || : -/bin/systemctl try-restart jetty.service >/dev/null 2>&1 || : - %endif # without jp_minimal %files client -f .mfiles-jetty-client @@ -977,6 +965,9 @@ exit 0 %license LICENSE-eplv10-aslv20.html LICENSE-MIT %changelog +* Thu Jan 25 2018 Michael Simacek - 9.4.8-2.v20171121 +- Remove obsolete systemd conversion scriptlet + * Mon Dec 04 2017 Michael Simacek - 9.4.8-1.v20171121 - Update to upstream version 9.4.8.v20171121