OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 12-Oct-2009 09:06:24
Branch: HEAD Handle: 2009101208062400
Modified files:
openpkg-src/git git.patch git.spec
Log:
repackage Git
Summary:
Revision Changes Path
1.98 +28 -19 openpkg-src/git/git.patch
1.155 +26 -24 openpkg-src/git/git.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/git/git.patch
============================================================================
$ cvs diff -u -r1.97 -r1.98 git.patch
--- openpkg-src/git/git.patch 19 Sep 2009 07:27:22 -0000 1.97
+++ openpkg-src/git/git.patch 12 Oct 2009 07:06:24 -0000 1.98
@@ -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 2009-03-04 22:55:27 +0100
++++ cogito-0.18.2/Makefile 2009-10-12 08:59:30 +0200
@@ -2,8 +2,8 @@
prefix="$(HOME)"
@@ -14,7 +14,7 @@
Index: gc-utils/doc/Makefile
--- gc-utils/doc/Makefile.orig 2008-08-01 17:39:15 +0200
-+++ gc-utils/doc/Makefile 2009-03-04 22:55:27 +0100
++++ gc-utils/doc/Makefile 2009-10-12 08:59:30 +0200
@@ -29,17 +29,17 @@
.PHONY: gen install clean uninstall
@@ -37,10 +37,10 @@
endif
uninstall:
-Index: git-1.6.4.4/Documentation/Makefile
---- git-1.6.4.4/Documentation/Makefile.orig 2009-03-04 09:18:50 +0100
-+++ git-1.6.4.4/Documentation/Makefile 2009-03-04 22:59:49 +0100
-@@ -50,10 +50,10 @@
+Index: git-1.6.5/Documentation/Makefile
+--- git-1.6.5/Documentation/Makefile.orig 2009-10-11 03:42:04 +0200
++++ git-1.6.5/Documentation/Makefile 2009-10-12 08:59:30 +0200
+@@ -51,10 +51,10 @@
infodir?=$(prefix)/share/info
MAKEINFO=makeinfo
INSTALL_INFO=install-info
@@ -53,10 +53,10 @@
endif
-include ../config.mak.autogen
-Index: git-1.6.4.4/Makefile
---- git-1.6.4.4/Makefile.orig 2009-03-04 09:18:50 +0100
-+++ git-1.6.4.4/Makefile 2009-03-04 23:00:34 +0100
-@@ -198,7 +198,7 @@
+Index: git-1.6.5/Makefile
+--- git-1.6.5/Makefile.orig 2009-10-11 03:42:04 +0200
++++ git-1.6.5/Makefile 2009-10-12 08:59:52 +0200
+@@ -239,7 +239,7 @@
infodir = share/info
gitexecdir = libexec/git-core
sharedir = $(prefix)/share
@@ -65,7 +65,7 @@
htmldir = share/doc/git-doc
ifeq ($(prefix),/usr)
sysconfdir = /etc
-@@ -844,10 +844,10 @@
+@@ -1045,10 +1045,10 @@
else
ifdef CURLDIR
# Try "-Wl,-rpath=$(CURLDIR)/$(lib)" in such a case.
@@ -77,12 +77,21 @@
- CURL_LIBCURL = -lcurl
+ CURL_LIBCURL = -lcurl -lssl -lcrypto
endif
- BUILTIN_OBJS += builtin-http-fetch.o
- EXTLIBS += $(CURL_LIBCURL)
-Index: git-1.6.4.4/perl/Makefile.PL
---- git-1.6.4.4/perl/Makefile.PL.orig 2009-03-04 09:18:50 +0100
-+++ git-1.6.4.4/perl/Makefile.PL 2009-03-04 22:55:27 +0100
-@@ -26,5 +26,6 @@
+ PROGRAMS += git-remote-curl$X git-http-fetch$X
+ curl_check := $(shell (echo 070908; curl-config --vernum) | sort -r |
sed -ne 2p)
+@@ -1086,7 +1086,7 @@
+ OPENSSL_LINK =
+ endif
+ ifdef NEEDS_CRYPTO_WITH_SSL
+- OPENSSL_LINK += -lcrypto
++ OPENSSL_LIBSSL += -lcrypto
+ endif
+ else
+ BASIC_CFLAGS += -DNO_OPENSSL
+Index: git-1.6.5/perl/Makefile.PL
+--- git-1.6.5/perl/Makefile.PL.orig 2009-10-11 03:42:04 +0200
++++ git-1.6.5/perl/Makefile.PL 2009-10-12 08:59:30 +0200
+@@ -34,5 +34,6 @@
VERSION_FROM => 'Git.pm',
PM => \%pm,
MAKEFILE => 'perl.mak',
@@ -92,7 +101,7 @@
);
Index: stgit-0.14.3/setup.py
--- stgit-0.14.3/setup.py.orig 2008-06-09 00:26:03 +0200
-+++ stgit-0.14.3/setup.py 2009-03-04 22:55:27 +0100
++++ stgit-0.14.3/setup.py 2009-10-12 08:59:30 +0200
@@ -61,10 +61,10 @@
long_description = 'Push/pop utility on top of GIT',
scripts = ['stg'],
@@ -110,7 +119,7 @@
('share/doc/stgit', glob.glob('doc/*.txt'))]
Index: stgit-0.14.3/stg
--- stgit-0.14.3/stg.orig 2006-04-07 23:38:54 +0200
-+++ stgit-0.14.3/stg 2009-03-04 22:55:27 +0100
++++ stgit-0.14.3/stg 2009-10-12 08:59:30 +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.154 -r1.155 git.spec
--- openpkg-src/git/git.spec 19 Sep 2009 07:27:22 -0000 1.154
+++ openpkg-src/git/git.spec 12 Oct 2009 07:06:24 -0000 1.155
@@ -22,7 +22,7 @@
##
# package version
-%define V_git 1.6.4.4
+%define V_git 1.6.5
%define V_cogito 0.18.2
%define V_stgit 0.14.3
%define V_guilt 0.32.1
@@ -40,7 +40,7 @@
Group: SCM
License: GPL
Version: %{V_git}
-Release: 20090919
+Release: 20091012
# package options
%option with_cogito no
@@ -135,29 +135,30 @@
%build
# build GIT core
( cd git-%{V_git}
- libs="-liconv"
- case "%{l_platform -t}" in
- *-linux* ) libs="$libs -ldl" ;;
- esac
- ( echo "CC := %{l_cc}"
- echo "ALL_CFLAGS := %{l_cflags -O} %{l_cppflags}
\$(ALL_CFLAGS)"
- echo "ALL_LDFLAGS := %{l_ldflags} \$(ALL_LDFLAGS) $libs"
- echo "INSTALL = %{l_shtool} install -c"
- echo "TAR = %{l_tar}"
- echo "CURLDIR = %{l_prefix}"
- echo "OPENSSLDIR = %{l_prefix}"
- echo "SHELL_PATH = %{l_prefix}/bin/bash"
- echo "PERL_PATH = %{l_prefix}/bin/perl"
- echo "PYTHON_PATH = %{l_prefix}/bin/python"
- echo "GITWEB_CONFIG = %{l_prefix}/etc/git/gitweb.config.pl"
- echo "GITWEB_BASE_URL = /openpkg-cgi/gitweb.d"
- echo "GITWEB_CSS = /openpkg-cgi/gitweb.d/gitweb.css"
- echo "GITWEB_LOGO = /openpkg-cgi/gitweb.d/git-logo.png"
- echo "GITWEB_FAVICON = /openpkg-cgi/gitweb.d/git-favicon.png"
- echo "GITWEB_PROJECTROOT = %{l_prefix}/var/git"
- echo "NO_TCLTK = yes"
- echo "prefix = %{l_prefix}"
+ ( echo "GITWEB_CONFIG = %{l_prefix}/etc/git/gitweb.config.pl"
+ echo "GITWEB_BASE_URL = /openpkg-cgi/gitweb.d"
+ echo "GITWEB_CSS = /openpkg-cgi/gitweb.d/gitweb.css"
+ echo "GITWEB_LOGO = /openpkg-cgi/gitweb.d/git-logo.png"
+ echo "GITWEB_FAVICON = /openpkg-cgi/gitweb.d/git-favicon.png"
+ echo "GITWEB_PROJECTROOT = %{l_prefix}/var/git"
+ echo "NEEDS_CRYPTO_WITH_SSL = YesPlease"
) >config.mak
+ CC="%{l_cc}" \
+ CFLAGS="%{l_cflags -O}" \
+ CPPFLAGS="%{l_cppflags}" \
+ LDFLAGS="%{l_ldflags}" \
+ ./configure \
+ --prefix=%{l_prefix} \
+ --mandir=%{l_prefix}/man \
+ --with-openssl=%{l_prefix} \
+ --with-curl=%{l_prefix} \
+ --with-expat=%{l_prefix} \
+ --with-iconv=%{l_prefix} \
+ --with-zlib=%{l_prefix} \
+ --with-perl=%{l_prefix}/bin/bash \
+ --with-perl=%{l_prefix}/bin/perl \
+ --without-tcltk \
+ --disable-pthreads
%{l_make} %{l_mflags}
%if "%{with_doc}" == "yes"
%{l_make} %{l_mflags} doc
@@ -293,6 +294,7 @@
# strip down installation
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
+ strip $RPM_BUILD_ROOT%{l_prefix}/libexec/git-core/* >/dev/null 2>&1 ||
true
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/doc
# create additional directories
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
