packages: gitolite/gitolite.spec, gitolite/lib.patch - up to 2.0

wiget wiget at pld-linux.org
Fri Apr 15 20:09:16 CEST 2011 

Author: wiget                        Date: Fri Apr 15 18:09:16 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.0

---- Files affected:
packages/gitolite:
   gitolite.spec (1.16 -> 1.17) , lib.patch (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/gitolite/gitolite.spec
diff -u packages/gitolite/gitolite.spec:1.16 packages/gitolite/gitolite.spec:1.17
--- packages/gitolite/gitolite.spec:1.16	Mon Feb 14 12:01:08 2011
+++ packages/gitolite/gitolite.spec	Fri Apr 15 20:09:10 2011
@@ -6,12 +6,12 @@
 Summary:	Software for hosting git repositories
 Summary(pl.UTF-8):	Narzędzie do hostowania repozytoriów git
 Name:		gitolite
-Version:	1.5.9
+Version:	2.0
 Release:	1
 License:	GPL v2
 Group:		Development/Tools
 Source0:	http://github.com/sitaramc/gitolite/tarball/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	195c3bb527d1873151ee12c46814ae2c
+# 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
@@ -92,14 +92,14 @@
 cp -p conf/example.gitolite.rc $RPM_BUILD_ROOT%{_sysconfdir}/gitolite
 cp -a hooks/* $RPM_BUILD_ROOT%{_datadir}/gitolite/hooks
 
-rm -rf $RPM_BUILD_ROOT%{py_sitescriptdir}/gitosis/test
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/gitolite/hooks/common/gl-pre-git.hub-sample
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README.mkd conf/example.conf
+%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
@@ -125,6 +125,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2011/04/15 18:09:10  wiget
+- up to 2.0
+
 Revision 1.16  2011/02/14 11:01:08  wiget
 - 1.5.9
 - updated lib.patch

================================================================
Index: packages/gitolite/lib.patch
diff -u packages/gitolite/lib.patch:1.6 packages/gitolite/lib.patch:1.7
--- packages/gitolite/lib.patch:1.6	Mon Feb 14 12:01:08 2011
+++ packages/gitolite/lib.patch	Fri Apr 15 20:09:10 2011
@@ -1,80 +1,50 @@
---- sitaramc-gitolite-9b5793f/contrib/adc/get-rights-and-owner.in-perl.old	2011-01-15 14:32:34.000000000 +0100
-+++ sitaramc-gitolite-9b5793f/contrib/adc/get-rights-and-owner.in-perl	2011-02-14 11:59:29.565791964 +0100
-@@ -4,6 +4,7 @@
- use warnings;
+--- sitaramc-gitolite-80d28e6/contrib/adc/get-rights-and-owner.in-perl.old	2011-03-05 12:59:20.000000000 +0100
++++ sitaramc-gitolite-80d28e6/contrib/adc/get-rights-and-owner.in-perl	2011-04-15 19:53:08.182357528 +0200
+@@ -7,6 +7,7 @@
+ die "ENV GL_BINDIR not set\n" unless $ENV{GL_BINDIR};
  
  unshift @INC, $ENV{GL_BINDIR};
 +use lib "/usr/share/gitolite/lib";
  require gitolite or die "parse gitolite.pm failed\n";
+ gitolite->import;
  
- # get the repo name
---- sitaramc-gitolite-9b5793f/contrib/adc/gl-reflog.old	2011-01-15 14:32:34.000000000 +0100
-+++ sitaramc-gitolite-9b5793f/contrib/adc/gl-reflog	2011-02-14 11:59:29.565791964 +0100
-@@ -41,6 +41,7 @@
- $limit ||= 10;
+--- sitaramc-gitolite-80d28e6/contrib/adc/git.old	2011-03-05 12:59:20.000000000 +0100
++++ sitaramc-gitolite-80d28e6/contrib/adc/git	2011-04-15 19:53:08.189022618 +0200
+@@ -85,6 +85,7 @@
+     die "ENV GL_BINDIR not set\n" unless $ENV{GL_BINDIR};
  
- unshift @INC, $ENV{GL_BINDIR};
+     unshift @INC, $ENV{GL_BINDIR};
 +use lib "/usr/share/gitolite/lib";
- require gitolite or die "parse gitolite.pm failed\n";
+     require gitolite or die "parse gitolite.pm failed\n";
+     gitolite->import;
  
- my ($perm, $creator, $wild) = &repo_rights($repo);
---- sitaramc-gitolite-9b5793f/hooks/common/update.old	2011-01-15 14:32:34.000000000 +0100
-+++ sitaramc-gitolite-9b5793f/hooks/common/update	2011-02-14 11:59:29.569125380 +0100
-@@ -36,6 +36,7 @@
- die "parse $ENV{GL_RC} failed: "       . ($! or $@) unless do $ENV{GL_RC};
+--- sitaramc-gitolite-80d28e6/contrib/adc/gl-reflog.old	2011-03-05 12:59:20.000000000 +0100
++++ sitaramc-gitolite-80d28e6/contrib/adc/gl-reflog	2011-04-15 19:53:08.192355164 +0200
+@@ -44,6 +44,7 @@
+ $limit ||= 10;
  
  unshift @INC, $ENV{GL_BINDIR};
 +use lib "/usr/share/gitolite/lib";
  require gitolite or die "parse gitolite.pm failed\n";
+ gitolite->import;
  
- my ($perm, $creator, $wild) = &repo_rights($ENV{GL_REPO});
---- sitaramc-gitolite-9b5793f/src/gl-auth-command.old	2011-01-15 14:32:34.000000000 +0100
-+++ sitaramc-gitolite-9b5793f/src/gl-auth-command	2011-02-14 11:59:29.572458795 +0100
-@@ -45,6 +45,7 @@
- $bindir =~ s/\/[^\/]+$//;
- $bindir = "$ENV{PWD}/$bindir" unless $bindir =~ /^\//;
- unshift @INC, $bindir;
-+use lib "/usr/share/gitolite/lib";
- require gitolite or die "parse gitolite.pm failed\n";
- 
- # ask where the rc file is, get it, and "do" it
---- sitaramc-gitolite-9b5793f/src/gl-compile-conf.old	2011-01-15 14:32:34.000000000 +0100
-+++ sitaramc-gitolite-9b5793f/src/gl-compile-conf	2011-02-14 11:59:29.575792210 +0100
-@@ -61,6 +61,7 @@
- $bindir =~ s/\/[^\/]+$//;
- $bindir = "$ENV{PWD}/$bindir" unless $bindir =~ /^\//;
- unshift @INC, $bindir;
-+use lib "/usr/share/gitolite/lib";
- require gitolite or die "parse gitolite.pm failed\n";
+--- sitaramc-gitolite-80d28e6/contrib/adc/hub.old	2011-03-05 12:59:20.000000000 +0100
++++ sitaramc-gitolite-80d28e6/contrib/adc/hub	2011-04-15 19:53:08.195687710 +0200
+@@ -64,6 +64,7 @@
+ usage() unless ($dispatch{$cmd});
  
- # ask where the rc file is, get it, and "do" it
---- sitaramc-gitolite-9b5793f/src/gl-install.old	2011-01-15 14:32:34.000000000 +0100
-+++ sitaramc-gitolite-9b5793f/src/gl-install	2011-02-14 11:59:29.575792210 +0100
-@@ -29,6 +29,7 @@
- my $bindir = $0;
- $bindir =~ s/\/[^\/]+$//;
- unshift @INC, $bindir;
-+use lib "/usr/share/gitolite/lib";
- require gitolite or die "parse gitolite.pm failed\n";
- 
- # ask where the rc file is, get it, and "do" it
---- sitaramc-gitolite-9b5793f/src/gl-setup-authkeys.old	2011-01-15 14:32:34.000000000 +0100
-+++ sitaramc-gitolite-9b5793f/src/gl-setup-authkeys	2011-02-14 11:59:29.579125625 +0100
-@@ -31,6 +31,7 @@
- $bindir =~ s/\/[^\/]+$//;
- $bindir = "$ENV{PWD}/$bindir" unless $bindir =~ /^\//;
- unshift @INC, $bindir;
+ unshift @INC, $ENV{GL_BINDIR};
 +use lib "/usr/share/gitolite/lib";
  require gitolite or die "parse gitolite.pm failed\n";
+ gitolite->import;
  
- # prevent newbie from running it accidentally and clobbering his authkeys
---- sitaramc-gitolite-9b5793f/src/gl-time.old	2011-01-15 14:32:34.000000000 +0100
-+++ sitaramc-gitolite-9b5793f/src/gl-time	2011-02-14 11:59:29.582459040 +0100
-@@ -23,6 +23,7 @@
- $bindir =~ s/\/[^\/]+$//;
- $bindir = "$ENV{PWD}/$bindir" unless $bindir =~ /^\//;
- unshift @INC, $bindir;
+--- sitaramc-gitolite-80d28e6/src/gl-query-rc.old	2011-03-05 12:59:20.000000000 +0100
++++ sitaramc-gitolite-80d28e6/src/gl-query-rc	2011-04-15 19:53:08.195687710 +0200
+@@ -14,6 +14,7 @@
+     $0 =~ m|^(/)?(.*)/| and $ENV{GL_BINDIR} = ($1 || "$ENV{PWD}/") . $2;
+ }
+ use lib $ENV{GL_BINDIR};
 +use lib "/usr/share/gitolite/lib";
- require gitolite or die "parse gitolite.pm failed\n";
+ require gitolite_rc;
+ gitolite_rc->import;
  
- # ---------------------------------------------------------------
================================================================

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

More information about the pld-cvs-commit mailing list