[svn] r6382 - trunk/rpms/pound

[packagers at lists.rpmforge.net]

Author: dag
Date: 2008-06-22 22:28:28 +0100 (Sun, 22 Jun 2008)
New Revision: 6382

Modified:
   trunk/rpms/pound/pound.spec
Log:
Minor changes

Modified: trunk/rpms/pound/pound.spec
===================================================================
--- trunk/rpms/pound/pound.spec	2008-06-22 21:28:17 UTC (rev 6381)
+++ trunk/rpms/pound/pound.spec	2008-06-22 21:28:28 UTC (rev 6382)
@@ -39,18 +39,17 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%{__install} -d %{buildroot}%{_sbindir} %{buildroot}%{_mandir}  %{buildroot}%{_sysconfdir}/init.d
-%{__make} install DESTDIR=%{buildroot}
-%{__install} %{_sourcedir}/pound.init %{buildroot}%{_sysconfdir}/init.d/pound
-%{__install} %{_sourcedir}/pound.cfg %{buildroot}%{_sysconfdir}/pound.cfg
+%{__make} install DESTDIR="%{buildroot}"
+%{__install} -Dp -m0755 %{_sourcedir}/pound.init %{buildroot}%{_initrddir}/pound
+%{__install} -Dp -m0644 %{_sourcedir}/pound.cfg %{buildroot}%{_sysconfdir}/pound.cfg
 
 %post
 /sbin/chkconfig --add pound
 
 %preun
 if [ $1 -eq 0 ]; then
-	/sbin/service pound stop >/dev/null 2>&1
-	/sbin/chkconfig --del pound
+    /sbin/service pound stop &>/dev/null || :
+    /sbin/chkconfig --del pound
 fi
 
 %clean
@@ -61,14 +60,14 @@
 %doc CHANGELOG FAQ GPL.txt README
 %doc %{_mandir}/man8/pound.8*
 %doc %{_mandir}/man8/poundctl.8*
+%config(noreplace) %{_sysconfdir}/pound.cfg
+%config %{_initrddir}/pound
 %{_sbindir}/pound
 %{_sbindir}/poundctl
-%{_sysconfdir}/init.d/pound
-%config %{_sysconfdir}/pound.cfg
 
 %changelog
 * Fri Jun 20 2008 Thomas M Steenholdt <tmus at tmus.dk> - 2.4.3-1
-- Updated to release 2.4.3
+- Updated to release 2.4.3.
 - Added initscript and default pound.cfg (intentionally non-working as provided)
 
 * Thu Apr 17 2008 Dag Wieers <dag at wieers.com> - 2.4.1-1