Author: pawelz Date: Mon Jun 7 13:02:21 2010 GMT Module: packages Tag: HEAD ---- Log message: - lib.patch (thx sparky)
---- Files affected: packages/gitolite: gitolite.spec (1.2 -> 1.3) , lib.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/gitolite/gitolite.spec diff -u packages/gitolite/gitolite.spec:1.2 packages/gitolite/gitolite.spec:1.3 --- packages/gitolite/gitolite.spec:1.2 Mon Jun 7 14:44:19 2010 +++ packages/gitolite/gitolite.spec Mon Jun 7 15:02:13 2010 @@ -12,6 +12,7 @@ # git://eagain.net/gitosis.git Source0: http://github.com/sitaramc/gitolite/tarball/v%{version}/%{name}-%{version}.tar.gz # Source0-md5: bb5f1ed88cbf96ca5d4fbda2adf5ed3f +Patch0: lib.patch URL: http://github.com/sitaramc/gitolite BuildRequires: rpm-perlprov BuildRequires: rpmbuild(macros) >= 1.219 @@ -40,6 +41,8 @@ mv sitaramc-gitolite-*/* . rm -rf sitaramc-gitolite-* +%patch0 -p1 + rm src/gl-system-install echo %{version} > conf/VERSION @@ -50,8 +53,9 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}/gitolite,%{_datadir}/gitolite/hooks} -cp src/* $RPM_BUILD_ROOT%{_bindir} +install -d $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}/gitolite,%{_datadir}/gitolite/{hooks,lib}} +cp src/gl-* src/sshkeys-lint $RPM_BUILD_ROOT%{_bindir} +cp src/gitolite.pm $RPM_BUILD_ROOT%{_datadir}/gitolite/lib cp -a conf/* $RPM_BUILD_ROOT%{_sysconfdir}/gitolite cp -a hooks/* $RPM_BUILD_ROOT%{_datadir}/gitolite/hooks @@ -75,6 +79,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.3 2010/06/07 13:02:13 pawelz +- lib.patch (thx sparky) + Revision 1.2 2010/06/07 12:44:19 pawelz - dropped Patch0 ================================================================ Index: packages/gitolite/lib.patch diff -u /dev/null packages/gitolite/lib.patch:1.1 --- /dev/null Mon Jun 7 15:02:21 2010 +++ packages/gitolite/lib.patch Mon Jun 7 15:02:13 2010 @@ -0,0 +1,36 @@ +--- gitolite-1.5.1/src/gl-install~ 2010-06-02 08:59:47.000000000 +0200 ++++ gitolite-1.5.1/src/gl-install 2010-06-07 14:51:51.000000000 +0200 +@@ -26,7 +26,8 @@ + # the common setup module is in the same directory as this running program is + my $bindir = $0; + $bindir =~ s/\/[^\/]+$//; +-require "$bindir/gitolite.pm"; ++use lib "/usr/share/data/gitolite/lib"; ++require gitolite; + + # ask where the rc file is, get it, and "do" it + &where_is_rc(); +--- gitolite-1.5.1/src/gl-auth-command~ 2010-06-02 08:59:47.000000000 +0200 ++++ gitolite-1.5.1/src/gl-auth-command 2010-06-07 14:53:08.000000000 +0200 +@@ -33,7 +33,8 @@ + my $bindir = $0; + $bindir =~ s/\/[^\/]+$//; + $bindir = "$ENV{PWD}/$bindir" unless $bindir =~ /^\//; +-require "$bindir/gitolite.pm"; ++use lib "/usr/share/data/gitolite/lib"; ++require gitolite; + + # ask where the rc file is, get it, and "do" it + &where_is_rc(); +--- gitolite-1.5.1/src/gl-compile-conf~ 2010-06-02 08:59:47.000000000 +0200 ++++ gitolite-1.5.1/src/gl-compile-conf 2010-06-07 14:53:30.000000000 +0200 +@@ -60,7 +60,8 @@ + my $bindir = $0; + $bindir =~ s/\/[^\/]+$//; + $bindir = "$ENV{PWD}/$bindir" unless $bindir =~ /^\//; +-require "$bindir/gitolite.pm"; ++use lib "/usr/share/data/gitolite/lib"; ++require gitolite; + + # ask where the rc file is, get it, and "do" it + &where_is_rc(); ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gitolite/gitolite.spec?r1=1.2&r2=1.3&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
