packages: pld-gitolite/pld-gitolite.spec - use .gz extension for tar+gz - d...

[glen]

Author: glen                         Date: Mon Dec 19 17:28:36 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use .gz extension for tar+gz
- deps for useradd/groupadd
- fix parem dirs packaging
- package can be noarch
- typo in username

---- Files affected:
packages/pld-gitolite:
   pld-gitolite.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/pld-gitolite/pld-gitolite.spec
diff -u packages/pld-gitolite/pld-gitolite.spec:1.1 packages/pld-gitolite/pld-gitolite.spec:1.2
--- packages/pld-gitolite/pld-gitolite.spec:1.1	Fri Dec 16 22:22:17 2011
+++ packages/pld-gitolite/pld-gitolite.spec	Mon Dec 19 18:28:31 2011
@@ -2,14 +2,24 @@
 Summary:	Gitolite setup used by PLD
 Name:		pld-gitolite
 Version:	0.1
-Release:	0.1
+Release:	0.2
 License:	GPL v2
 Group:		Development/Building
-Source0:	https://github.com/draenog/gitolite-scripts/tarball/v%{version}/gitolite-scripts.tar.bz2
+Source0:	https://github.com/draenog/gitolite-scripts/tarball/v%{version}/gitolite-scripts.tar.gz
 # Source0-md5:	ac759e1ab4d95fd154a30c3c5254de40
 Source1:	gitolite.conf
 Source2:	gitolite.rc
+BuildRequires:	rpmbuild(macros) >= 1.202
 Requires:	gitolite
+Provides:	group(gitolite)
+Provides:	user(gitolite)
+Requires(postun):	/usr/sbin/groupdel
+Requires(pre):	/usr/bin/getgid
+Requires(pre):	/usr/sbin/groupadd
+Requires(postun):	/usr/sbin/userdel
+Requires(pre):	/bin/id
+Requires(pre):	/usr/sbin/useradd
+BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -22,12 +32,11 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 # create directories if necessary
-install -d $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/home/services/gitolite/repositories
 install -d $RPM_BUILD_ROOT/home/services/gitolite/.gitolite/{conf,hooks/common}
 
-cp -a %{SOURCE1} $RPM_BUILD_ROOT/home/services/gitolite/.gitolite/conf
-cp -a %{SOURCE2} $RPM_BUILD_ROOT/home/services/gitolite/.gitolite.rc
+cp -p %{SOURCE1} $RPM_BUILD_ROOT/home/services/gitolite/.gitolite/conf
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/home/services/gitolite/.gitolite.rc
 cp -a hooks/* $RPM_BUILD_ROOT/home/services/gitolite/.gitolite/hooks/common
 cp -a adc $RPM_BUILD_ROOT/home/services/gitolite/
 touch $RPM_BUILD_ROOT/home/services/gitolite//projects.list
@@ -38,11 +47,7 @@
 
 %pre
 %groupadd -g 264 gitolite
-%useradd -u 264 -d /home/services/gitolite -s /bin/sh -g gitolite -c "PLD Gitolie User" gitolite
-
-%post
-
-%preun
+%useradd -u 264 -d /home/services/gitolite -s /bin/sh -g gitolite -c "PLD Gitolite User" gitolite
 
 %postun
 if [ "$1" = "0" ]; then
@@ -50,17 +55,31 @@
 	%groupremove gitolite
 fi
 
-
 %files
+%defattr(644,root,root,755)
+
+# all files owned by gitolite:gitolite
 %defattr(644,gitolite,gitolite,755)
-/home/services/gitolite
+
+%dir /home/services/gitolite
 %dir /home/services/gitolite/repositories
-%config(noreplace) %verify(not md5 mtime size) /home/services/gitolite/.gitolite/conf/gitolite.conf
+
+%dir /home/services/gitolite/.gitolite
 %config(noreplace) %verify(not md5 mtime size) /home/services/gitolite/.gitolite.rc
+
+%dir /home/services/gitolite/.gitolite/conf
+%config(noreplace) %verify(not md5 mtime size) /home/services/gitolite/.gitolite/conf/gitolite.conf
+
+%dir /home/services/gitolite/.gitolite/hooks
+%dir /home/services/gitolite/.gitolite/hooks/common
+%attr(744,gitolite,gitolite) /home/services/gitolite/.gitolite/hooks/common/update.secondary
+%attr(744,gitolite,gitolite) /home/services/gitolite/.gitolite/hooks/common/post-receive
+%dir /home/services/gitolite/.gitolite/hooks/common/post-receive.d
+%attr(744,gitolite,gitolite) /home/services/gitolite/.gitolite/hooks/common/post-receive.d/mailnotification
+
+%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/.gitolite/hooks/common//update.secondary
-%attr(744,gitolite,gitolite) /home/services/gitolite/.gitolite/hooks/common//post-receive
-%attr(744,gitolite,gitolite) /home/services/gitolite/.gitolite/hooks/common//post-receive.d/mailnotification
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -68,6 +87,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2011/12/19 17:28:31  glen
+- use .gz extension for tar+gz
+- deps for useradd/groupadd
+- fix parem dirs packaging
+- package can be noarch
+- typo in username
+
 Revision 1.1  2011/12/16 21:22:17  draenog
 - initial version
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pld-gitolite/pld-gitolite.spec?r1=1.1&r2=1.2&f=u