OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 04-Apr-2007 17:38:13
Branch: HEAD Handle: 2007040416381200
Modified files:
openpkg-src/git git.patch git.spec
Log:
upgrading package: git 1.5.0.6 -> 1.5.1
Summary:
Revision Changes Path
1.27 +9 -9 openpkg-src/git/git.patch
1.56 +2 -2 openpkg-src/git/git.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/git/git.patch
============================================================================
$ cvs diff -u -r1.26 -r1.27 git.patch
--- openpkg-src/git/git.patch 29 Mar 2007 05:41:22 -0000 1.26
+++ openpkg-src/git/git.patch 4 Apr 2007 15:38:12 -0000 1.27
@@ -12,29 +12,29 @@
INSTALL?=install
-Index: git-1.5.0.6/Makefile
---- git-1.5.0.6/Makefile.orig 2007-02-14 03:46:46 +0100
-+++ git-1.5.0.6/Makefile 2007-02-18 19:43:17 +0100
-@@ -123,7 +123,7 @@
+Index: git-1.5.1/Makefile
+--- git-1.5.1.orig/Makefile.orig 2007-04-04 10:40:33 +0200
++++ git-1.5.1/Makefile 2007-04-04 17:33:42 +0200
+@@ -132,7 +132,7 @@
prefix = $(HOME)
bindir = $(prefix)/bin
gitexecdir = $(bindir)
-template_dir = $(prefix)/share/git-core/templates/
+template_dir = $(prefix)/share/git/core/templates/
+ ETC_GITCONFIG = $(prefix)/etc/gitconfig
# DESTDIR=
- # default configuration for gitweb
-@@ -447,10 +447,10 @@
+@@ -463,10 +463,10 @@
ifndef NO_CURL
ifdef CURLDIR
# 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`
++ 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)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/git/git.spec
============================================================================
$ cvs diff -u -r1.55 -r1.56 git.spec
--- openpkg-src/git/git.spec 29 Mar 2007 05:41:22 -0000 1.55
+++ openpkg-src/git/git.spec 4 Apr 2007 15:38:12 -0000 1.56
@@ -23,7 +23,7 @@
##
# package version
-%define V_git 1.5.0.6
+%define V_git 1.5.1
%define V_cogito 0.18.2
%define V_stgit 0.12.1
%define V_guilt 0.23
@@ -39,7 +39,7 @@
Group: SCM
License: GPL
Version: %{V_git}
-Release: 20070329
+Release: 20070404
# 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
