packages: git-core-slug/git-core-slug.spec - cleanups, pldize, no double slash

[glen]

Author: glen                         Date: Sun Jul  1 18:58:58 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- cleanups, pldize, no double slash

---- Files affected:
packages/git-core-slug:
   git-core-slug.spec (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: packages/git-core-slug/git-core-slug.spec
diff -u packages/git-core-slug/git-core-slug.spec:1.22 packages/git-core-slug/git-core-slug.spec:1.23
--- packages/git-core-slug/git-core-slug.spec:1.22	Sat Jun 30 19:59:19 2012
+++ packages/git-core-slug/git-core-slug.spec	Sun Jul  1 20:58:53 2012
@@ -1,5 +1,4 @@
 # $Revision$, $Date$
-
 %define 	module	git_slug
 Summary:	Tools to interact with PLD git repositories
 Name:		git-core-slug
@@ -57,21 +56,22 @@
 	--optimize=2 \
 	--root=$RPM_BUILD_ROOT
 
-%{make} man-install DESTDIR=$RPM_BUILD_ROOT
+%{__make} man-install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_libdir}/git-core
 ln -s %{_bindir}/slug.py $RPM_BUILD_ROOT%{_libdir}/git-core/git-pld
 echo ".so slug.py.1" > $RPM_BUILD_ROOT%{_mandir}/man1/git-pld.1
 
-install -D %SOURCE1 $RPM_BUILD_ROOT/etc/rc.d/init.d/slug_watch
+install -Dp %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/slug_watch
 install -d $RPM_BUILD_ROOT/home/services/git/.gitolite/hooks/common
-cp -r post-receive.python.d $RPM_BUILD_ROOT/home/services/git/.gitolite/hooks/common
+cp -rp post-receive.python.d $RPM_BUILD_ROOT/home/services/git/.gitolite/hooks/common
 install -d $RPM_BUILD_ROOT/home/services/git/{watchdir,Refs}
 touch $RPM_BUILD_ROOT/home/services/git/{watchdir,Refs}
 
-install -D %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.d/slug_watch
-install -D %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/slug_watch
-install -D %{SOURCE4} $RPM_BUILD_ROOT/%{_bindir}
+install -Dp %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.d/slug_watch
+install -Dp %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/slug_watch
+install -Dp %{SOURCE4} $RPM_BUILD_ROOT%{_bindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -82,8 +82,8 @@
 
 %preun watch
 if [ "$1" = "0" ]; then
-        %service -q slug_watch stop
-        /sbin/chkconfig --del slug_watch
+	%service -q slug_watch stop
+	/sbin/chkconfig --del slug_watch
 fi
 
 %files
@@ -93,9 +93,7 @@
 %{_libdir}/git-core/git-pld
 %{_mandir}/man1/*.1*
 %{py3_sitescriptdir}/%{module}
-%if "%{py_ver}" > "2.4"
 %{py3_sitescriptdir}/git_core_slug-*.egg-info
-%endif
 
 %files watch
 %defattr(644,root,root,755)
@@ -111,13 +109,15 @@
 %attr(744,git,git) %dir /home/services/git/watchdir
 %attr(744,git,git) %dir /home/services/git/Refs
 
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2012/07/01 18:58:53  glen
+- cleanups, pldize, no double slash
+
 Revision 1.22  2012/06/30 17:59:19  draenog
 - up to 0.12
 - don't replace crontab file
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/git-core-slug/git-core-slug.spec?r1=1.22&r2=1.23