packages: gitolite/gitolite.spec, gitolite/lib.patch (REMOVED) - install pe...

[draenog]

Author: draenog                      Date: Wed Apr 20 13:49:45 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- install perl modules in perl_vendorlib (remove lib.patch)
- list %{_sysconfidir}/gitolite only once

---- Files affected:
packages/gitolite:
   gitolite.spec (1.17 -> 1.18) , lib.patch (1.7 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/gitolite/gitolite.spec
diff -u packages/gitolite/gitolite.spec:1.17 packages/gitolite/gitolite.spec:1.18
--- packages/gitolite/gitolite.spec:1.17	Fri Apr 15 20:09:10 2011
+++ packages/gitolite/gitolite.spec	Wed Apr 20 15:49:40 2011
@@ -12,10 +12,6 @@
 Group:		Development/Tools
 Source0:	http://github.com/sitaramc/gitolite/tarball/v%{version}/%{name}-%{version}.tar.gz
 # Source0-md5:	6a5b0ba784f190ff2d94a7e0ad46fe3f
-# Use the following script to update Patch0:
-# for I in $(ack 'require gitolite' gitolite-1.5.8/ | cut -d: -f1 | sort | uniq ); do mv $I $I.old; sed < $I.old > $I '/require gitolite/iuse lib "/usr/share/gitolite/lib";'; done
-# for I in $(ack 'require gitolite' gitolite-1.5.8/ | cut -d: -f1 | sort | uniq | grep -v old); do diff -u $I.old $I; done
-Patch0:		lib.patch
 URL:		http://github.com/sitaramc/gitolite
 BuildRequires:	perl-Text-Markdown
 BuildRequires:	rpm-perlprov
@@ -26,9 +22,6 @@
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_noautoprov	perl(gitolite)
-%define		_noautoreq	perl(gitolite)
-
 %description
 Gitolite allows a server to host many git repositories and provide
 access to many developers, without having to give them real userids on
@@ -65,7 +58,6 @@
 %setup -qc
 mv sitaramc-gitolite-*/* .
 rm -rf sitaramc-gitolite-*
-%patch0 -p1
 
 rm src/gl-system-install
 
@@ -86,9 +78,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}/gitolite,%{_datadir}/gitolite/{hooks,lib}}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}/gitolite,%{_datadir}/gitolite/hooks,%{perl_vendorlib}}
 cp -a src/gl-* src/sshkeys-lint $RPM_BUILD_ROOT%{_bindir}
-cp -p src/gitolite.pm $RPM_BUILD_ROOT%{_datadir}/gitolite/lib
+cp -p src/*.pm $RPM_BUILD_ROOT%{perl_vendorlib}
 cp -p conf/example.gitolite.rc $RPM_BUILD_ROOT%{_sysconfdir}/gitolite
 cp -a hooks/* $RPM_BUILD_ROOT%{_datadir}/gitolite/hooks
 
@@ -101,12 +93,11 @@
 %defattr(644,root,root,755)
 %doc README.mkd conf/example.conf hooks/common/gl-pre-git.hub-sample
 %dir %{_sysconfdir}/gitolite
-%dir %{_sysconfdir}/gitolite
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gitolite/example.gitolite.rc
 %attr(755,root,root) %{_bindir}/gl-*
 %attr(755,root,root) %{_bindir}/sshkeys-lint
 %dir %{_datadir}/gitolite
-%{_datadir}/gitolite/lib
+%{perl_vendorlib}/gitolite*.pm
 %dir %{_datadir}/gitolite/hooks
 %dir %{_datadir}/gitolite/hooks/common
 %dir %{_datadir}/gitolite/hooks/gitolite-admin
@@ -125,6 +116,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2011/04/20 13:49:40  draenog
+- install perl modules in perl_vendorlib (remove lib.patch)
+- list %{_sysconfidir}/gitolite only once
+
 Revision 1.17  2011/04/15 18:09:10  wiget
 - up to 2.0
 
================================================================

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