packages: pld-gitolite/pld-gitolite.spec, pld-gitolite/pld-developers (NEW)...

[draenog]

Author: draenog                      Date: Sat Jun 16 22:08:06 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.8
- don't use @all group with sskm, as it can result in commits authored by
  zzz-marked-for-add-<nick>
- fix gid of gitweb configuration file

---- Files affected:
packages/pld-gitolite:
   pld-gitolite.spec (1.7 -> 1.8) , pld-developers (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/pld-gitolite/pld-gitolite.spec
diff -u packages/pld-gitolite/pld-gitolite.spec:1.7 packages/pld-gitolite/pld-gitolite.spec:1.8
--- packages/pld-gitolite/pld-gitolite.spec:1.7	Thu Apr  5 19:53:16 2012
+++ packages/pld-gitolite/pld-gitolite.spec	Sun Jun 17 00:08:00 2012
@@ -3,17 +3,19 @@
 # - real webapps integration
 Summary:	Gitolite setup used by PLD
 Name:		pld-gitolite
-Version:	0.6
-Release:	1
+Version:	0.8
+Release:	0.1
 License:	GPL v2
 Group:		Development/Building
 Source0:	https://github.com/draenog/gitolite-scripts/tarball/v%{version}/gitolite-scripts.tar.gz
-# Source0-md5:	bf460d4f33c346a7276f996a2859ddf0
+# Source0-md5:	dbd360677ca97e9893547c5d5e31fde6
 Source1:	gitolite.conf
 Source2:	gitolite.rc
 Source3:	git.conf
 Source4:	gitweb.conf
+Source5:	pld-developers
 BuildRequires:	rpmbuild(macros) >= 1.202
+Requires:	git-core-slug
 Requires:	gitolite
 Requires:	perl-RPC-XML
 Provides:	group(gitolite)
@@ -42,7 +44,7 @@
 install -d $RPM_BUILD_ROOT/home/services/gitolite/repositories
 install -d $RPM_BUILD_ROOT/home/services/gitolite/.gitolite/{conf,hooks/common}
 
-cp -p %{SOURCE1} $RPM_BUILD_ROOT/home/services/gitolite/.gitolite/conf
+cp -p %{SOURCE1} %{SOURCE5} $RPM_BUILD_ROOT/home/services/gitolite/.gitolite/conf
 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
@@ -65,7 +67,7 @@
 
 %files
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/webapps/gitweb/gitweb-pld.conf
+%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/webapps/gitweb/gitweb-pld.conf
 
 # all files owned by gitolite:gitolite
 %defattr(644,gitolite,gitolite,755)
@@ -79,6 +81,7 @@
 
 %dir /home/services/gitolite/.gitolite/conf
 %config(noreplace) %verify(not md5 mtime size) /home/services/gitolite/.gitolite/conf/gitolite.conf
+%config(noreplace) %verify(not md5 mtime size) /home/services/gitolite/.gitolite/conf/pld-developers
 
 %dir /home/services/gitolite/.gitolite/hooks
 %dir /home/services/gitolite/.gitolite/hooks/common
@@ -93,6 +96,7 @@
 %dir /home/services/gitolite/adc
 %dir /home/services/gitolite/adc/bin
 %attr(744,gitolite,gitolite) /home/services/gitolite/adc/bin/create
+%attr(744,gitolite,gitolite) /home/services/gitolite/adc/bin/sskm
 /home/services/gitolite/adc/bin/adc.common-functions
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -101,6 +105,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2012/06/16 22:08:00  draenog
+- up to 0.8
+- don't use @all group with sskm, as it can result in commits authored by
+  zzz-marked-for-add-<nick>
+- fix gid of gitweb configuration file
+
 Revision 1.7  2012/04/05 17:53:16  draenog
 - up to 0.6
 - R: perl-RPC-XML for ciabot

================================================================
Index: packages/pld-gitolite/pld-developers
diff -u /dev/null packages/pld-gitolite/pld-developers:1.1
--- /dev/null	Sun Jun 17 00:08:06 2012
+++ packages/pld-gitolite/pld-developers	Sun Jun 17 00:08:00 2012
@@ -0,0 +1,3 @@
+# There are no continuation line markers but group definitions accumulate
+# @pld-devel = <name1>
+# @pld-devel = <name2>
================================================================

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