[myproxy] tmpfile.d configuration does not support comments and must be 0644

stevetraylen stevetraylen at fedoraproject.org
Mon Mar 5 20:31:59 UTC 2012


commit 8ba2432aff11cb9e45da26fc390df1bb2b23af78
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Mon Mar 5 22:12:04 2012 +0100

    tmpfile.d configuration does not support comments and must
    be 0644

 myproxy-server-tmpfiles.d.conf |    1 -
 myproxy.spec                   |   12 ++++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/myproxy-server-tmpfiles.d.conf b/myproxy-server-tmpfiles.d.conf
index 727a60f..cef4237 100644
--- a/myproxy-server-tmpfiles.d.conf
+++ b/myproxy-server-tmpfiles.d.conf
@@ -1,2 +1 @@
-# Create a directory for myproxy-server pid file.
 D /var/run/myproxy-server 0710 myproxy root -
diff --git a/myproxy.spec b/myproxy.spec
index d960a29..560e876 100644
--- a/myproxy.spec
+++ b/myproxy.spec
@@ -16,7 +16,7 @@
 
 Name:           myproxy
 Version:        5.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Manage X.509 Public Key Infrastructure (PKI) security credentials
 
 Group:          System Environment/Daemons
@@ -274,8 +274,8 @@ install  -m 644 myproxy.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/myproxy-s
 %else
 mkdir -p %{buildroot}%{_unitdir}
 mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d
-install -p myproxy-server-tmpfiles.d.conf %{buildroot}%{_sysconfdir}/tmpfiles.d/myproxy-server.conf
-install -p myproxy-server.service %{buildroot}%{_unitdir}/myproxy-server.service
+install -m 0644 -p myproxy-server-tmpfiles.d.conf %{buildroot}%{_sysconfdir}/tmpfiles.d/myproxy-server.conf
+install -p -m 0644 myproxy-server.service %{buildroot}%{_unitdir}/myproxy-server.service
 mkdir -p %{buildroot}%{_localstatedir}/run/
 install -d -m 0710 %{buildroot}%{_localstatedir}/run/myproxy-server/
 %endif
@@ -376,7 +376,7 @@ fi
 %{_initddir}/myproxy-server
 %config(noreplace)    %{_sysconfdir}/sysconfig/myproxy-server
 %else
-%dir %{_localstatedir}/run/myproxy-server/
+%attr(0710,myproxy,root) %dir  %{_localstatedir}/run/myproxy-server/
 %config(noreplace) %{_sysconfdir}/tmpfiles.d/myproxy-server.conf
 %{_unitdir}/myproxy-server.service
 %endif
@@ -432,6 +432,10 @@ fi
 %{_libdir}/pkgconfig/myproxy.pc
 
 %changelog
+* Mon Mar 5 2012 Steve Traylen <steve.traylen at cern.ch> - 5.6-3
+- tmpfile.d configuration does not support comments and must 
+  be 0644
+
 * Tue Feb 28 2012 Steve Traylen <steve.traylen at cern.ch> - 5.6-2
 - Include Sources: for sysv and systemd always.
 - Silly mistakes.


More information about the scm-commits mailing list