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: 02-Sep-2007 20:27:14
Branch: HEAD Handle: 2007090219271400
Modified files:
openpkg-src/git git.patch git.spec
Log:
upgrading package: git 1.5.2.5 -> 1.5.3
Summary:
Revision Changes Path
1.40 +14 -14 openpkg-src/git/git.patch
1.74 +2 -2 openpkg-src/git/git.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/git/git.patch
============================================================================
$ cvs diff -u -r1.39 -r1.40 git.patch
--- openpkg-src/git/git.patch 16 Aug 2007 07:32:26 -0000 1.39
+++ openpkg-src/git/git.patch 2 Sep 2007 18:27:14 -0000 1.40
@@ -1,6 +1,6 @@
Index: cogito-0.18.2/Makefile
--- cogito-0.18.2/Makefile.orig 2006-11-17 01:37:24 +0100
-+++ cogito-0.18.2/Makefile 2007-05-20 20:04:34 +0200
++++ cogito-0.18.2/Makefile 2007-09-02 20:09:56 +0200
@@ -2,8 +2,8 @@
prefix="$(HOME)"
@@ -12,26 +12,26 @@
INSTALL?=install
-Index: git-1.5.2.5/Makefile
---- git-1.5.2.5/Makefile.orig 2007-05-20 10:40:55 +0200
-+++ git-1.5.2.5/Makefile 2007-05-20 20:05:06 +0200
+Index: git-1.5.3/Makefile
+--- git-1.5.3/Makefile.orig 2007-09-02 07:57:44 +0200
++++ git-1.5.3/Makefile 2007-09-02 20:17:30 +0200
@@ -145,7 +145,7 @@
bindir = $(prefix)/bin
gitexecdir = $(bindir)
- sharedir = $(prefix)/share/
--template_dir = $(sharedir)/git-core/templates/
-+template_dir = $(sharedir)/git/core/templates/
+ sharedir = $(prefix)/share
+-template_dir = $(sharedir)/git-core/templates
++template_dir = $(sharedir)/git/core/templates
ifeq ($(prefix),/usr)
sysconfdir = /etc
else
-@@ -510,10 +510,10 @@
+@@ -507,10 +507,10 @@
ifndef NO_CURL
ifdef CURLDIR
- # Try "-Wl,-rpath=$(CURLDIR)/lib" in such a case.
+ # Try "-Wl,-rpath=$(CURLDIR)/$(lib)" in such a case.
- BASIC_CFLAGS += -I$(CURLDIR)/include
-- CURL_LIBCURL = -L$(CURLDIR)/lib $(CC_LD_DYNPATH)$(CURLDIR)/lib
-lcurl
-+ BASIC_CFLAGS += `$(CURLDIR)/bin/curl-config --cflags`
-+ CURL_LIBCURL = `$(CURLDIR)/bin/curl-config --libs`
+- CURL_LIBCURL = -L$(CURLDIR)/$(lib)
$(CC_LD_DYNPATH)$(CURLDIR)/$(lib) -lcurl
++ BASIC_CFLAGS += `$(CURLDIR)/bin/curl-config --cflags`
++ CURL_LIBCURL = `$(CURLDIR)/bin/curl-config --libs`
else
- CURL_LIBCURL = -lcurl
+ CURL_LIBCURL = -lcurl -lssl -lcrypto
@@ -40,7 +40,7 @@
curl_check := $(shell (echo 070908; curl-config --vernum) | sort -r |
sed -ne 2p)
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-05-20 20:04:34 +0200
++++ stgit-0.13/setup.py 2007-09-02 20:09:56 +0200
@@ -15,10 +15,10 @@
long_description = 'Push/pop utility on top of GIT',
scripts = ['stg'],
@@ -58,7 +58,7 @@
('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-05-20 20:04:34 +0200
++++ stgit-0.13/stg 2007-09-02 20:09:56 +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.73 -r1.74 git.spec
--- openpkg-src/git/git.spec 24 Aug 2007 18:13:17 -0000 1.73
+++ openpkg-src/git/git.spec 2 Sep 2007 18:27:14 -0000 1.74
@@ -23,7 +23,7 @@
##
# package version
-%define V_git 1.5.2.5
+%define V_git 1.5.3
%define V_cogito 0.18.2
%define V_stgit 0.13
%define V_guilt 0.27
@@ -39,7 +39,7 @@
Group: SCM
License: GPL
Version: %{V_git}
-Release: 20070824
+Release: 20070902
# package options
%option with_cogito yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
