rpms/jetty/F-10 jetty.spec,1.11,1.12
Jeff Johnston
jjohnstn at fedoraproject.org
Thu Feb 5 23:16:18 UTC 2009
Author: jjohnstn
Update of /cvs/pkgs/rpms/jetty/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29442
Modified Files:
jetty.spec
Log Message:
* Tue Feb 03 2009 Jeff Johnston <jjohnstn at redhat.com> 5.1.14-1.9
- Change %%{_sysconfdir}/init.d references to be %%{_initrddir}
- Resolves #473585
Index: jetty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jetty/F-10/jetty.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jetty.spec 2 Feb 2009 18:25:19 -0000 1.11
+++ jetty.spec 5 Feb 2009 23:15:47 -0000 1.12
@@ -339,7 +339,7 @@
rm -rf $RPM_BUILD_ROOT
# dirs
install -dm 755 $RPM_BUILD_ROOT%{_bindir}
-install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/init.d
+install -dm 755 $RPM_BUILD_ROOT%{_initrddir}
install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
install -dm 755 $RPM_BUILD_ROOT%{confdir}
@@ -359,7 +359,7 @@
# main pkg
install -pm 755 extra/unix/bin/jetty.sh $RPM_BUILD_ROOT%{_bindir}/d%{name}
install -pm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}
-install -pm 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name}
+install -pm 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/%{name}
install -pm 755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
install -pm 644 start.jar $RPM_BUILD_ROOT%{homedir}/bin
install -pm 644 stop.jar $RPM_BUILD_ROOT%{homedir}/bin
@@ -522,8 +522,8 @@
%preun
if [ $1 = 0 ]; then
- [ -f /var/lock/subsys/%{name} ] && %{_sysconfdir}/init.d/%{name} stop
- [ -f %{_sysconfdir}/init.d/%{name} -a -x /sbin/chkconfig ] && /sbin/chkconfig --del %{name}
+ [ -f /var/lock/subsys/%{name} ] && %{_initrddir}/%{name} stop
+ [ -f %{_initrddir}/%{name} -a -x /sbin/chkconfig ] && /sbin/chkconfig --del %{name}
%{_sbindir}/fedora-userdel %{name} >> /dev/null 2>&1 || :
fi
@@ -556,7 +556,7 @@
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/LICENSE.TXT
%doc %{_docdir}/%{name}-%{version}/VERSION.TXT
-%{_sysconfdir}/init.d/%{name}
+%{_initrddir}/%{name}
%{_sysconfdir}/logrotate.d/%{name}
%if %{gcj_support}
%dir %attr(-,root,root) %{_libdir}/gcj/%{name}/
@@ -606,9 +606,13 @@
%endif
%changelog
-* Mon Feb 02 2009 Jeff Johnston <jjohnstn at redhat.com> 5.1.14-1.8
+* Tue Feb 03 2009 Jeff Johnston <jjohnstn at redhat.com> 5.1.14-1.9
+- Change %%{_sysconfdir}/init.d references to be %%{_initrddir}
- Resolves #473585
+* Mon Feb 02 2009 Jeff Johnston <jjohnstn at redhat.com> 5.1.14-1.8
+- Fixes for unowned directories.
+
* Tue Jan 06 2009 Jeff Johnston <jjohnstn at redhat.com> 5.1.14-1.7
- Patch init.d script to add status operation
- Patch unix djetty script so it doesn't issue error messages about /dev/tty
More information about the fedora-extras-commits
mailing list