diff --git a/jetty.spec b/jetty.spec index f2d289e..823b993 100644 --- a/jetty.spec +++ b/jetty.spec @@ -55,7 +55,7 @@ Name: jetty Version: 9.3.7 -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 @@ -814,11 +814,11 @@ JETTY_PID=\$JETTY_RUN/jetty.pid EO_RC ) > %{buildroot}%{homedir}/.jettyrc -mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d +mkdir -p %{buildroot}%{_tmpfilesdir} ( cat << EOF -D /var/run/%{name} 0755 %username %{username} - +D %{rundir} 0755 %username %{username} - EOF -) > %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf +) > %{buildroot}%{_tmpfilesdir}/%{name}.conf rm -fr %{buildroot}%{homedir}/logs ln -s %{logdir} %{buildroot}%{homedir}/logs @@ -878,7 +878,7 @@ exit 0 %files %if %{with service} -%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf +%{_tmpfilesdir}/%{name}.conf %config(noreplace) %attr(644, root, root) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{confdir} %dir %{jettylibdir} @@ -969,6 +969,11 @@ exit 0 %doc NOTICE.txt LICENSE* %changelog +* Fri Feb 19 2016 Michael Simacek - 9.3.7-2.v20160115 +- Use %%_tmpfilesdir +- Resolves: rhbz#1289494 +- Fix changelog + * Mon Feb 15 2016 Michael Simacek - 9.3.7-1.v20160115 - Update to upstream version 9.3.7.v20160115 - Port to current mongo-java-driver @@ -1110,7 +1115,7 @@ exit 0 - Install licenses with jetty-util subpackage * Sat Sep 21 2013 Mikolaj Izdebski - 9.0.5-2 -- Move configuration directories to %{_sysconfdir} +- Move configuration directories to %%{_sysconfdir} - Resolves: rhbz#596611 * Thu Aug 22 2013 Michal Srb - 9.0.5-1 @@ -1379,7 +1384,7 @@ exit 0 * Tue May 19 2009 Jeff Johnston 5.1.15-1 - Upgrade to 5.1.15 source tarball for Fedora. -* Fri Apr 22 2009 Jeff Johnston 5.1.14-3 +* Wed Apr 22 2009 Jeff Johnston 5.1.14-3 - Add %%{libdir} to files list. - Resolves #473585 @@ -1527,7 +1532,7 @@ exit 0 - Fixed URL - relaxed some versioned dependencies -* Sun Aug 23 2004 Randy Watler - 0:4.2.20-2jpp +* Mon Aug 23 2004 Randy Watler - 0:4.2.20-2jpp - Rebuild with ant-1.6.2 * Fri Jun 18 2004 Ralph Apel - 0:4.2.20-1jpp