From f6a68ad16cf4e3c7daf5716196256a8876a48efd Mon Sep 17 00:00:00 2001 From: Jiri Skala Date: Dec 09 2010 07:05:26 +0000 Subject: - #656681 - using tmpfiles.d --- diff --git a/quagga-tmpfs.conf b/quagga-tmpfs.conf new file mode 100644 index 0000000..ca67d53 --- /dev/null +++ b/quagga-tmpfs.conf @@ -0,0 +1 @@ +d /var/run/quagga 0751 root root diff --git a/quagga.spec b/quagga.spec index 09ef334..8728dbb 100644 --- a/quagga.spec +++ b/quagga.spec @@ -32,11 +32,12 @@ Summary: Routing daemon Name: quagga Version: 0.99.17 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Daemons Source0: http://www.quagga.net/download/%{name}-%{version}.tar.gz Source1: quagga-filter-perl-requires.sh +Source2: quagga-tmpfs.conf Patch1: quagga-0.99.15-perl_pth.patch Patch2: quagga-0.99.16-posix.patch @@ -203,6 +204,9 @@ install -m644 %{zeb_rh_src}/quagga.pam $RPM_BUILD_ROOT/etc/pam.d/quagga install -m644 %{zeb_rh_src}/quagga.logrotate $RPM_BUILD_ROOT/etc/logrotate.d/quagga install -d -m770 $RPM_BUILD_ROOT/var/run/quagga +install -d -m 755 $RPM_BUILD_ROOT/etc/tmpfiles.d +install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/tmpfiles.d/quagga.conf + rm $RPM_BUILD_ROOT%{_libdir}/*.a rm $RPM_BUILD_ROOT%{_libdir}/*.la @@ -296,13 +300,13 @@ rm -rf $RPM_BUILD_ROOT %doc ChangeLog INSTALL NEWS README REPORTING-BUGS SERVICES TODO %if %quagga_user %dir %attr(751,%quagga_user,%quagga_user) %{_sysconfdir} -%dir %attr(770,%quagga_user,%quagga_user) %ghost /var/log/quagga -%dir %attr(771,%quagga_user,%quagga_user) %ghost /var/run/quagga +%dir %attr(770,%quagga_user,%quagga_user) /var/log/quagga +%dir %attr(771,%quagga_user,%quagga_user) /var/run/quagga %else %dir %attr(750,root,root) %{_sysconfdir} -%dir %attr(750,root,root) %ghost /var/log/quagga +%dir %attr(750,root,root) /var/log/quagga %dir %attr(755,root,root) /usr/share/info -%dir %attr(750,root,root) %ghost /var/run/quagga +%dir %attr(750,root,root) /var/run/quagga %endif %if %vty_group # noreplace not used due to smaple conf file @@ -324,6 +328,7 @@ rm -rf $RPM_BUILD_ROOT %endif %config(noreplace) %attr(640,root,root) /etc/logrotate.d/quagga %config(noreplace) /etc/sysconfig/quagga +%config(noreplace) /etc/tmpfiles.d/quagga.conf %files contrib @@ -345,6 +350,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Thu Dec 08 2010 Jiri Skala - 0.99.17-4 +- #656681 - using tmpfiles.d + * Thu Dec 02 2010 Jiri Skala - 0.99.17-3 - fixes #656681 - using %ghost on files in /var/run and /var/lock - removed unused script from spec