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: 21-Dec-2006 08:47:45
Branch: HEAD Handle: 2006122107474400
Modified files:
openpkg-src/git git.patch git.spec
Log:
upgrading package: git 1.4.4.2 -> 1.4.4.3
Summary:
Revision Changes Path
1.15 +9 -6 openpkg-src/git/git.patch
1.38 +3 -2 openpkg-src/git/git.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/git/git.patch
============================================================================
$ cvs diff -u -r1.14 -r1.15 git.patch
--- openpkg-src/git/git.patch 19 Oct 2006 06:15:53 -0000 1.14
+++ openpkg-src/git/git.patch 21 Dec 2006 07:47:44 -0000 1.15
@@ -1,12 +1,15 @@
Index: Makefile
---- Makefile.orig 2006-10-19 01:32:58 +0200
-+++ Makefile 2006-10-19 07:59:35 +0200
-@@ -432,9 +432,9 @@
+--- Makefile.orig 2006-12-20 21:11:12 +0100
++++ Makefile 2006-12-21 08:44:54 +0100
+@@ -438,11 +438,10 @@
+
+ ifndef NO_CURL
ifdef CURLDIR
- # This is still problematic -- gcc does not always want -R.
- BASIC_CFLAGS += -I$(CURLDIR)/include
+- # This is still problematic -- gcc does not always want -R.
+- BASIC_CFLAGS += -I$(CURLDIR)/include
- CURL_LIBCURL = -L$(CURLDIR)/lib -R$(CURLDIR)/lib -lcurl
-+ CURL_LIBCURL = -L$(CURLDIR)/lib -R$(CURLDIR)/lib -lcurl -lssl
-lcrypto
++ BASIC_CFLAGS += `$(CURLDIR)/bin/curl-config --cflags`
++ CURL_LIBCURL = `$(CURLDIR)/bin/curl-config --libs`
else
- CURL_LIBCURL = -lcurl
+ CURL_LIBCURL = -lcurl -lssl -lcrypto
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/git/git.spec
============================================================================
$ cvs diff -u -r1.37 -r1.38 git.spec
--- openpkg-src/git/git.spec 7 Dec 2006 07:39:25 -0000 1.37
+++ openpkg-src/git/git.spec 21 Dec 2006 07:47:44 -0000 1.38
@@ -23,7 +23,7 @@
##
# package version
-%define V_git 1.4.4.2
+%define V_git 1.4.4.3
%define V_cogito 0.18.2
%define V_stgit 0.11
@@ -38,7 +38,7 @@
Group: SCM
License: GPL
Version: %{V_git}
-Release: 20061207
+Release: 20061221
# list of sources
Source0: http://www.kernel.org/pub/software/scm/git/git-%{V_git}.tar.gz
@@ -133,6 +133,7 @@
--prefix=%{l_prefix}
) || exit $?
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/doc
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
