From f4a1c369c84ae252d7ba649823544b751e7abde5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Thu, 13 Dec 2012 13:21:09 +0000 Subject: [PATCH] Fix some packaging warnings and errors. --- org.glite.lb.server/project/glite-lb-server.spec | 2 +- org.glite.px.myproxy-yaim/project/glite-px-myproxy-yaim.spec | 2 +- org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/org.glite.lb.server/project/glite-lb-server.spec b/org.glite.lb.server/project/glite-lb-server.spec index 8ac6057..f5b5ab4 100644 --- a/org.glite.lb.server/project/glite-lb-server.spec +++ b/org.glite.lb.server/project/glite-lb-server.spec @@ -130,6 +130,7 @@ fi %dir %{_docdir}/%{name}-%{version} %dir %{_sysconfdir}/cron.d/ %dir %{_sysconfdir}/glite-lb/ +%config(noreplace) %{_sysconfdir}/cron.d/* %config(noreplace) %{_sysconfdir}/glite-lb/* %config(noreplace) %{_sysconfdir}/logrotate.d/glite-lb-server %config(noreplace) %{_sysconfdir}/mysql/conf.d/glite-lb-server.cnf @@ -138,7 +139,6 @@ fi %{_docdir}/%{name}-%{version}/ChangeLog %{_docdir}/%{name}-%{version}/LICENSE %{_docdir}/%{name}-%{version}/glite-lb -%{_sysconfdir}/cron.d/* %{_initrddir}/glite-lb-bkserverd %{_bindir}/* %{_sbindir}/* diff --git a/org.glite.px.myproxy-yaim/project/glite-px-myproxy-yaim.spec b/org.glite.px.myproxy-yaim/project/glite-px-myproxy-yaim.spec index 915af10..f7c5c7a 100644 --- a/org.glite.px.myproxy-yaim/project/glite-px-myproxy-yaim.spec +++ b/org.glite.px.myproxy-yaim/project/glite-px-myproxy-yaim.spec @@ -14,7 +14,7 @@ BuildArch: noarch Requires: glite-yaim-bdii Requires: glite-yaim-core Obsoletes: glite-yaim-myproxy <= 4.0.4-2 -Provides: glite-yaim-myproxy +Provides: glite-yaim-myproxy = %{version}-%{release} %description @DESCRIPTION@ diff --git a/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec b/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec index 4d13f73..aedfa2d 100644 --- a/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec +++ b/org.glite.px.proxyrenewal/project/glite-px-proxyrenewal.spec @@ -99,20 +99,20 @@ exit 0 %post progs /sbin/chkconfig --add glite-proxy-renewald if [ $1 -eq 1 ] ; then - /sbin/chkconfig glite-proxy-renewald off + /sbin/chkconfig glite-proxy-renewald off fi %preun progs if [ $1 -eq 0 ] ; then - /sbin/service glite-proxy-renewald stop >/dev/null 2>&1 - /sbin/chkconfig --del glite-proxy-renewald + /sbin/service glite-proxy-renewald stop >/dev/null 2>&1 + /sbin/chkconfig --del glite-proxy-renewald fi %postun progs if [ "$1" -ge "1" ] ; then - /sbin/service glite-proxy-renewald condrestart >/dev/null 2>&1 || : + /sbin/service glite-proxy-renewald condrestart >/dev/null 2>&1 || : fi @@ -132,7 +132,6 @@ fi %dir %{_includedir}/glite/ %dir %{_includedir}/glite/security/ %dir %{_includedir}/glite/security/proxyrenewal/ -%attr(0700,glite,glite) %{_localstatedir}/spool/glite-renewd %{_includedir}/glite/security/proxyrenewal/*.h %{_libdir}/libglite_security_proxyrenewal.so %{_libdir}/libglite_security_proxyrenewal_core.so @@ -140,6 +139,7 @@ fi %files progs %defattr(-,root,root) %dir %attr(0755, glite, glite) %{_localstatedir}/glite +%dir %attr(0700, glite, glite) %{_localstatedir}/spool/glite-renewd %doc LICENSE project/ChangeLog README %{_initrddir}/glite-proxy-renewald %{_bindir}/glite-proxy-renew -- 1.8.2.3