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-Feb-2008 17:19:27
Branch: HEAD Handle: 2008020216192500
Modified files:
openpkg-src/git git.patch git.spec
Log:
upgrading package: git 1.5.3.8 -> 1.5.4
Summary:
Revision Changes Path
1.51 +20 -21 openpkg-src/git/git.patch
1.87 +2 -2 openpkg-src/git/git.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/git/git.patch
============================================================================
$ cvs diff -u -r1.50 -r1.51 git.patch
--- openpkg-src/git/git.patch 8 Jan 2008 19:17:03 -0000 1.50
+++ openpkg-src/git/git.patch 2 Feb 2008 16:19:25 -0000 1.51
@@ -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-10-05 09:53:14 +0200
++++ cogito-0.18.2/Makefile 2008-02-02 17:12:06 +0100
@@ -2,8 +2,8 @@
prefix="$(HOME)"
@@ -12,20 +12,20 @@
INSTALL?=install
-Index: git-1.5.3.8/Makefile
---- git-1.5.3.8/Makefile.orig 2007-10-03 21:44:53 +0200
-+++ git-1.5.3.8/Makefile 2007-10-05 09:53:14 +0200
-@@ -145,7 +145,7 @@
- bindir = $(prefix)/bin
+Index: git-1.5.4/Makefile
+--- git-1.5.4/Makefile.orig 2008-02-02 05:09:01 +0100
++++ git-1.5.4/Makefile 2008-02-02 17:12:28 +0100
+@@ -162,7 +162,7 @@
+ infodir = $(prefix)/share/info
gitexecdir = $(bindir)
sharedir = $(prefix)/share
-template_dir = $(sharedir)/git-core/templates
+template_dir = $(sharedir)/git/core/templates
+ htmldir=$(sharedir)/doc/git-doc
ifeq ($(prefix),/usr)
sysconfdir = /etc
+@@ -551,10 +551,10 @@
else
-@@ -507,10 +507,10 @@
- ifndef NO_CURL
ifdef CURLDIR
# Try "-Wl,-rpath=$(CURLDIR)/$(lib)" in such a case.
- BASIC_CFLAGS += -I$(CURLDIR)/include
@@ -36,23 +36,22 @@
- CURL_LIBCURL = -lcurl
+ 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: git-1.5.3.8/perl/Makefile.PL
---- git-1.5.3.8/perl/Makefile.PL.orig 2007-10-03 21:44:53 +0200
-+++ git-1.5.3.8/perl/Makefile.PL 2007-10-05 09:56:53 +0200
-@@ -29,6 +29,6 @@
+ BUILTIN_OBJS += builtin-http-fetch.o
+ EXTLIBS += $(CURL_LIBCURL)
+Index: git-1.5.4/perl/Makefile.PL
+--- git-1.5.4/perl/Makefile.PL.orig 2008-02-02 05:09:01 +0100
++++ git-1.5.4/perl/Makefile.PL 2008-02-02 17:12:53 +0100
+@@ -26,5 +26,5 @@
VERSION_FROM => 'Git.pm',
PM => \%pm,
MAKEFILE => 'perl.mak',
-- INSTALLSITEMAN3DIR => '$(SITEPREFIX)/share/man/man3',
-+ INSTALLSITEMAN3DIR => '$(SITEPREFIX)/man/man3',
- %extra
+- INSTALLSITEMAN3DIR => '$(SITEPREFIX)/share/man/man3'
++ INSTALLSITEMAN3DIR => '$(SITEPREFIX)/man/man3'
);
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 @@
+--- stgit-0.14.1/setup.py.orig 2007-12-12 00:54:04 +0100
++++ stgit-0.14.1/setup.py 2008-02-02 17:12:06 +0100
+@@ -58,10 +58,10 @@
long_description = 'Push/pop utility on top of GIT',
scripts = ['stg'],
packages = ['stgit', 'stgit.commands'],
@@ -69,7 +68,7 @@
('share/doc/stgit', glob.glob('doc/*.txt'))]
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
++++ stgit-0.14.1/stg 2008-02-02 17:12:06 +0100
@@ -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.86 -r1.87 git.spec
--- openpkg-src/git/git.spec 8 Jan 2008 19:17:03 -0000 1.86
+++ openpkg-src/git/git.spec 2 Feb 2008 16:19:25 -0000 1.87
@@ -22,7 +22,7 @@
##
# package version
-%define V_git 1.5.3.8
+%define V_git 1.5.4
%define V_cogito 0.18.2
%define V_stgit 0.14.1
%define V_guilt 0.28
@@ -38,7 +38,7 @@
Group: SCM
License: GPL
Version: %{V_git}
-Release: 20080108
+Release: 20080202
# package options
%option with_cogito yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
