OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 12-Dec-2007 10:32:18
Branch: HEAD Handle: 2007121209321700
Modified files:
openpkg-src/git git.patch git.spec
Log:
modifying package: git-1.5.3.7 20071202 -> 20071212
Summary:
Revision Changes Path
1.49 +6 -6 openpkg-src/git/git.patch
1.84 +3 -2 openpkg-src/git/git.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/git/git.patch
============================================================================
$ cvs diff -u -r1.48 -r1.49 git.patch
--- openpkg-src/git/git.patch 2 Dec 2007 08:19:17 -0000 1.48
+++ openpkg-src/git/git.patch 12 Dec 2007 09:32:17 -0000 1.49
@@ -49,9 +49,9 @@
+ INSTALLSITEMAN3DIR => '$(SITEPREFIX)/man/man3',
%extra
);
-Index: stgit-0.13/setup.py
---- stgit-0.13/setup.py.orig 2007-02-13 23:27:01 +0100
-+++ stgit-0.13/setup.py 2007-10-05 09:53:14 +0200
+Index: stgit-0.14.1/setup.py
+--- stgit-0.14.1/setup.py.orig 2007-02-13 23:27:01 +0100
++++ stgit-0.14.1/setup.py 2007-10-05 09:53:14 +0200
@@ -15,10 +15,10 @@
long_description = 'Push/pop utility on top of GIT',
scripts = ['stg'],
@@ -67,9 +67,9 @@
'contrib/stgbashprompt.sh',
'contrib/stgit-completion.bash']),
('share/doc/stgit', glob.glob('doc/*.txt'))]
-Index: stgit-0.13/stg
---- stgit-0.13/stg.orig 2006-04-07 23:38:54 +0200
-+++ stgit-0.13/stg 2007-10-05 09:53:14 +0200
+Index: stgit-0.14.1/stg
+--- stgit-0.14.1/stg.orig 2006-04-07 23:38:54 +0200
++++ stgit-0.14.1/stg 2007-10-05 09:53:14 +0200
@@ -26,12 +26,13 @@
# It is assumed that the user installed StGIT using the --prefix= option
prefix, bin = os.path.split(sys.path[0])
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/git/git.spec
============================================================================
$ cvs diff -u -r1.83 -r1.84 git.spec
--- openpkg-src/git/git.spec 2 Dec 2007 08:19:17 -0000 1.83
+++ openpkg-src/git/git.spec 12 Dec 2007 09:32:17 -0000 1.84
@@ -25,7 +25,7 @@
# package version
%define V_git 1.5.3.7
%define V_cogito 0.18.2
-%define V_stgit 0.13
+%define V_stgit 0.14.1
%define V_guilt 0.28
# package information
@@ -39,7 +39,7 @@
Group: SCM
License: GPL
Version: %{V_git}
-Release: 20071202
+Release: 20071212
# package options
%option with_cogito yes
@@ -195,6 +195,7 @@
# install StGIT add-on
%if "%{with_stgit}" == "yes"
( cd stgit-%{V_stgit}
+ PATH="`pwd`/../git-%{V_git}:$PATH"
%{l_prefix}/bin/python setup.py install \
--root=$RPM_BUILD_ROOT \
--prefix=%{l_prefix} \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
