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: 14-Feb-2007 20:34:16
Branch: HEAD Handle: 2007021419341600
Modified files:
openpkg-src/git git.patch git.spec
Log:
upgrading package: git 1.4.4.4 -> 1.5.0
Summary:
Revision Changes Path
1.18 +13 -16 openpkg-src/git/git.patch
1.44 +2 -2 openpkg-src/git/git.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/git/git.patch
============================================================================
$ cvs diff -u -r1.17 -r1.18 git.patch
--- openpkg-src/git/git.patch 7 Feb 2007 08:07:15 -0000 1.17
+++ openpkg-src/git/git.patch 14 Feb 2007 19:34:16 -0000 1.18
@@ -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-02-07 08:58:03 +0100
++++ cogito-0.18.2/Makefile 2007-02-14 20:06:31 +0100
@@ -2,8 +2,8 @@
prefix="$(HOME)"
@@ -12,38 +12,35 @@
INSTALL?=install
-Index: git-1.4.4.4/Makefile
---- git-1.4.4.4/Makefile.orig 2007-01-08 04:14:44 +0100
-+++ git-1.4.4.4/Makefile 2007-02-07 08:58:03 +0100
-@@ -115,8 +115,8 @@
+Index: git-1.5.0/Makefile
+--- git-1.5.0/Makefile.orig 2007-02-14 03:46:46 +0100
++++ git-1.5.0/Makefile 2007-02-14 20:08:06 +0100
+@@ -123,7 +123,7 @@
prefix = $(HOME)
bindir = $(prefix)/bin
gitexecdir = $(bindir)
-template_dir = $(prefix)/share/git-core/templates/
--GIT_PYTHON_DIR = $(prefix)/share/git-core/python
+template_dir = $(prefix)/share/git/core/templates/
-+GIT_PYTHON_DIR = $(prefix)/share/git/core/python
# DESTDIR=
# default configuration for gitweb
-@@ -438,11 +438,10 @@
-
+@@ -447,10 +447,10 @@
ifndef NO_CURL
ifdef CURLDIR
-- # This is still problematic -- gcc does not always want -R.
+ # Try "-Wl,-rpath=$(CURLDIR)/lib" in such a case.
- BASIC_CFLAGS += -I$(CURLDIR)/include
-- CURL_LIBCURL = -L$(CURLDIR)/lib -R$(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
++ CURL_LIBCURL = -lcurl -lssl -lcrypto
endif
PROGRAMS += git-http-fetch$X
curl_check := $(shell (echo 070908; curl-config --vernum) | sort -r |
sed -ne 2p)
Index: stgit-0.12/setup.py
--- stgit-0.12/setup.py.orig 2007-01-25 23:49:37 +0100
-+++ stgit-0.12/setup.py 2007-02-07 08:59:12 +0100
++++ stgit-0.12/setup.py 2007-02-14 20:06:31 +0100
@@ -15,10 +15,10 @@
long_description = 'Push/pop utility on top of GIT',
scripts = ['stg'],
@@ -61,7 +58,7 @@
('share/doc/stgit', glob.glob('doc/*.txt'))]
Index: stgit-0.12/stg
--- stgit-0.12/stg.orig 2006-04-07 23:38:54 +0200
-+++ stgit-0.12/stg 2007-02-07 08:58:03 +0100
++++ stgit-0.12/stg 2007-02-14 20:06:31 +0100
@@ -31,7 +31,8 @@
sys.exec_prefix = prefix
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/git/git.spec
============================================================================
$ cvs diff -u -r1.43 -r1.44 git.spec
--- openpkg-src/git/git.spec 7 Feb 2007 08:07:16 -0000 1.43
+++ openpkg-src/git/git.spec 14 Feb 2007 19:34:16 -0000 1.44
@@ -23,7 +23,7 @@
##
# package version
-%define V_git 1.4.4.4
+%define V_git 1.5.0
%define V_cogito 0.18.2
%define V_stgit 0.12
@@ -38,7 +38,7 @@
Group: SCM
License: GPL
Version: %{V_git}
-Release: 20070207
+Release: 20070214
# list of sources
Source0: http://www.kernel.org/pub/software/scm/git/git-%{V_git}.tar.gz
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
