packages: pld-gitolite/pld-gitolite.spec - no double slashes, webapps todo

glen glen at pld-linux.org
Mon Apr 2 16:58:15 CEST 2012


Author: glen                         Date: Mon Apr  2 14:58:15 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- no double slashes, webapps todo

---- Files affected:
packages/pld-gitolite:
   pld-gitolite.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/pld-gitolite/pld-gitolite.spec
diff -u packages/pld-gitolite/pld-gitolite.spec:1.5 packages/pld-gitolite/pld-gitolite.spec:1.6
--- packages/pld-gitolite/pld-gitolite.spec:1.5	Mon Apr  2 15:12:33 2012
+++ packages/pld-gitolite/pld-gitolite.spec	Mon Apr  2 16:58:09 2012
@@ -1,4 +1,6 @@
 # $Revision$, $Date$
+# TODO:
+# - real webapps integration
 Summary:	Gitolite setup used by PLD
 Name:		pld-gitolite
 Version:	0.4
@@ -41,10 +43,9 @@
 cp -p %{SOURCE2} $RPM_BUILD_ROOT/home/services/gitolite/.gitolite.rc
 cp -p %{SOURCE3} $RPM_BUILD_ROOT/home/services/gitolite/.gitconfig
 cp -a hooks/* $RPM_BUILD_ROOT/home/services/gitolite/.gitolite/hooks/common
-cp -a adc $RPM_BUILD_ROOT/home/services/gitolite/
-
-install -D %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/webapps/gitweb/gitweb-pld.conf
+cp -a adc $RPM_BUILD_ROOT/home/services/gitolite
 
+install -D %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/webapps/gitweb/gitweb-pld.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -61,6 +62,7 @@
 
 %files
 %defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/webapps/gitweb/gitweb-pld.conf
 
 # all files owned by gitolite:gitolite
 %defattr(644,gitolite,gitolite,755)
@@ -88,14 +90,15 @@
 %attr(744,gitolite,gitolite) /home/services/gitolite/adc/bin/create
 /home/services/gitolite/adc/bin/adc.common-functions
 
-%attr(644,root,root) %{_sysconfdir}/webapps/gitweb/gitweb-pld.conf
-
 %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.6  2012/04/02 14:58:09  glen
+- no double slashes, webapps todo
+
 Revision 1.5  2012/04/02 13:12:33  draenog
 - up to 0.4
 - config files for gitweb and mailing lists
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/pld-gitolite/pld-gitolite.spec?r1=1.5&r2=1.6



More information about the pld-cvs-commit mailing list