diff --git a/jetty.spec b/jetty.spec index f626b52..c0362ce 100644 --- a/jetty.spec +++ b/jetty.spec @@ -50,7 +50,7 @@ Name: jetty Version: 9.4.3 -Release: 2%{addver}%{?dist} +Release: 3%{addver}%{?dist} Summary: Java Webserver and Servlet Container # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt @@ -762,7 +762,7 @@ install -dm 755 %{buildroot}%{homedir}/start.d install -dm 755 %{buildroot}%{logdir} install -dm 755 %{buildroot}%{rundir} install -dm 755 %{buildroot}%{tempdir} -install -dm 755 %{buildroot}%{appdir} +install -dm 755 %{buildroot}%{jettylibdir} install -dm 755 %{buildroot}%{_unitdir} # systemd unit file @@ -818,7 +818,7 @@ mv %{buildroot}%{homedir}/etc/* %{buildroot}/%{confdir}/ rm -r %{buildroot}%{homedir}/etc ln -s %{confdir} %{buildroot}%{homedir}/etc -mv %{buildroot}%{homedir}/webapps/* %{buildroot}%{appdir}/ +mv %{buildroot}%{homedir}/webapps %{buildroot}%{appdir} ln -s %{appdir} %{buildroot}%{homedir}/webapps rm %{buildroot}%{homedir}/*.txt %{buildroot}%{homedir}/*.html @@ -951,6 +951,10 @@ exit 0 %license LICENSE-eplv10-aslv20.html LICENSE-MIT %changelog +* Fri Apr 14 2017 Mikolaj Izdebski - 9.4.3-3.v20170317 +- Fix installation of webapps directory +- Resolves: rhbz#1442334 + * Wed Apr 5 2017 Mikolaj Izdebski - 9.4.3-2.v20170317 - Make the requirement on "osgi.serviceloader.registrar" optional - Resolves: rhbz#1427189