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: 01-Aug-2008 21:09:15
Branch: HEAD Handle: 2008080120091500
Modified files:
openpkg-src/git git.patch git.spec
Log:
add gc-utils
Summary:
Revision Changes Path
1.70 +51 -11 openpkg-src/git/git.patch
1.111 +43 -5 openpkg-src/git/git.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/git/git.patch
============================================================================
$ cvs diff -u -r1.69 -r1.70 git.patch
--- openpkg-src/git/git.patch 20 Jul 2008 16:46:32 -0000 1.69
+++ openpkg-src/git/git.patch 1 Aug 2008 19:09:15 -0000 1.70
@@ -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 2008-02-02 17:12:06 +0100
++++ cogito-0.18.2/Makefile 2008-08-01 21:05:21 +0200
@@ -2,8 +2,8 @@
prefix="$(HOME)"
@@ -12,10 +12,50 @@
INSTALL?=install
+Index: gc-utils/doc/Makefile
+--- gc-utils/doc/Makefile.orig 2008-08-01 17:39:15 +0200
++++ gc-utils/doc/Makefile 2008-08-01 21:05:37 +0200
+@@ -29,17 +29,17 @@
+
+ .PHONY: gen install clean uninstall
+
+-gen:: $(manpagesgz)
++gen:: $(manpages)
+
+ $(manpagesgz):
+ $(QUIET_GEN) cat $(@:../build/%.1.gz=%.1) | sed -e
's,\$$VERSION\$$,$(VERSION_SQ),' | gzip -9 > $@
+
+-install: $(manpagesgz)
++install: $(manpages)
+ @$(MKINSTALLDIRS) $(DESTDIR)$(man1dir)
+ ifndef V
+- @$(foreach f, $(manpagesgz), $(QUIET_INSTALL) $(INSTALL) -m644 $f
"$(DESTDIR)$(man1dir)/$(f:../build/%=%)" ;)
++ @$(foreach f, $(manpages), $(QUIET_INSTALL) $(INSTALL) -m644 $f
"$(DESTDIR)$(man1dir)/$(f:../build/%=%)" ;)
+ else
+- $(foreach f, $(manpagesgz), $(INSTALL) -m644 $f
"$(DESTDIR)$(man1dir)/$(f:../build/%=%)" ;)
++ $(foreach f, $(manpages), $(INSTALL) -m644 $f
"$(DESTDIR)$(man1dir)/$(f:../build/%=%)" ;)
+ endif
+
+ uninstall:
+Index: git-1.5.6.4/Documentation/Makefile
+--- git-1.5.6.4/Documentation/Makefile.orig 2008-07-20 02:23:11 +0200
++++ git-1.5.6.4/Documentation/Makefile 2008-08-01 21:05:21 +0200
+@@ -48,9 +48,9 @@
+ infodir?=$(prefix)/share/info
+ MAKEINFO=makeinfo
+ INSTALL_INFO=install-info
+-DOCBOOK2X_TEXI=docbook2x-texi
++DOCBOOK2X_TEXI=docbook2texi
+ ifndef PERL_PATH
+- PERL_PATH = /usr/bin/perl
++ PERL_PATH = perl
+ endif
+
+ -include ../config.mak.autogen
Index: git-1.5.6.4/Makefile
---- git-1.5.6.4/Makefile.orig 2008-02-02 05:09:01 +0100
-+++ git-1.5.6.4/Makefile 2008-02-02 17:12:28 +0100
-@@ -162,7 +162,7 @@
+--- git-1.5.6.4/Makefile.orig 2008-07-20 02:23:11 +0200
++++ git-1.5.6.4/Makefile 2008-08-01 21:05:21 +0200
+@@ -176,7 +176,7 @@
infodir = $(prefix)/share/info
gitexecdir = $(bindir)
sharedir = $(prefix)/share
@@ -24,7 +64,7 @@
htmldir=$(sharedir)/doc/git-doc
ifeq ($(prefix),/usr)
sysconfdir = /etc
-@@ -551,10 +551,10 @@
+@@ -748,10 +748,10 @@
else
ifdef CURLDIR
# Try "-Wl,-rpath=$(CURLDIR)/$(lib)" in such a case.
@@ -39,8 +79,8 @@
BUILTIN_OBJS += builtin-http-fetch.o
EXTLIBS += $(CURL_LIBCURL)
Index: git-1.5.6.4/perl/Makefile.PL
---- git-1.5.6.4/perl/Makefile.PL.orig 2008-04-21 00:17:13 +0200
-+++ git-1.5.6.4/perl/Makefile.PL 2008-05-08 13:50:08 +0200
+--- git-1.5.6.4/perl/Makefile.PL.orig 2008-07-20 02:23:11 +0200
++++ git-1.5.6.4/perl/Makefile.PL 2008-08-01 21:05:21 +0200
@@ -26,5 +26,6 @@
VERSION_FROM => 'Git.pm',
PM => \%pm,
@@ -50,9 +90,9 @@
+ INSTALLSITEMAN3DIR => '$(SITEPREFIX)/man/man3'
);
Index: stgit-0.14.3/setup.py
---- stgit-0.14.3/setup.py.orig 2007-12-12 00:54:04 +0100
-+++ stgit-0.14.3/setup.py 2008-02-02 17:12:06 +0100
-@@ -58,10 +58,10 @@
+--- stgit-0.14.3/setup.py.orig 2008-06-09 00:26:03 +0200
++++ stgit-0.14.3/setup.py 2008-08-01 21:05:21 +0200
+@@ -61,10 +61,10 @@
long_description = 'Push/pop utility on top of GIT',
scripts = ['stg'],
packages = ['stgit', 'stgit.commands'],
@@ -69,7 +109,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 2008-02-02 17:12:06 +0100
++++ stgit-0.14.3/stg 2008-08-01 21:05:21 +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.110 -r1.111 git.spec
--- openpkg-src/git/git.spec 20 Jul 2008 16:46:32 -0000 1.110
+++ openpkg-src/git/git.spec 1 Aug 2008 19:09:15 -0000 1.111
@@ -27,6 +27,7 @@
%define V_stgit 0.14.3
%define V_guilt 0.30
%define V_tig 0.11
+%define V_gcutils 0.2.3
# package information
Name: git
@@ -39,13 +40,15 @@
Group: SCM
License: GPL
Version: %{V_git}
-Release: 20080720
+Release: 20080801
# package options
-%option with_cogito yes
-%option with_stgit yes
-%option with_guilt yes
-%option with_tig yes
+%option with_cogito yes
+%option with_stgit yes
+%option with_guilt yes
+%option with_tig yes
+%option with_gcutils yes
+%option with_doc no
# list of sources
Source0: http://www.kernel.org/pub/software/scm/git/git-%{V_git}.tar.gz
@@ -53,6 +56,7 @@
Source2:
http://homepage.ntlworld.com/cmarinas/stgit/stgit-%{V_stgit}.tar.gz
Source3:
http://www.kernel.org/pub/linux/kernel/people/jsipek/guilt/guilt-%{V_guilt}.tar.gz
Source4: http://jonas.nitro.dk/tig/releases/tig-%{V_tig}.tar.gz
+Source5:
http://switch.dl.sourceforge.net/gcutils/gcutils-v%{V_gcutils}.tar.gz
Patch0: git.patch
# build information
@@ -66,6 +70,12 @@
BuildPreReq: ncurses
PreReq: ncurses
%endif
+%if "%{with_gcutils}" == "yes"
+BuildPreReq: gzip
+%endif
+%if "%{with_doc}" == "yes"
+BuildPreReq: asciidoc, docbook2x
+%endif
AutoReq: no
AutoReqProv: no
@@ -106,6 +116,11 @@
url = http://jonas.nitro.dk/tig/releases/
regex = tig-(__VER__)\.tar\.gz
}
+ prog git:gcutils = {
+ version = %{V_gcutils}
+ url = http://prdownloads.sourceforge.net/gcutils/
+ regex = gcutils-v(__VER__)\.tar\.gz
+ }
%prep
%setup -q -c
@@ -113,6 +128,7 @@
%setup -q -T -D -a 2
%setup -q -T -D -a 3
%setup -q -T -D -a 4
+ %setup -q -T -D -a 5
%patch -p0
%build
@@ -141,6 +157,9 @@
echo "prefix = %{l_prefix}"
) >config.mak
%{l_make} %{l_mflags}
+%if "%{with_doc}" == "yes"
+ %{l_make} %{l_mflags} doc
+%endif
) || exit $?
# build Cogito frontend
@@ -175,6 +194,15 @@
) || exit $?
%endif
+ # build GC-Utils add-on
+%if "%{with_gcutils}" == "yes"
+ ( cd gc-utils
+ %{l_make} %{l_mflags} \
+ prefix=%{l_prefix} \
+ mandir=%{l_prefix}/man
+ ) || exit $?
+%endif
+
%install
rm -rf $RPM_BUILD_ROOT
@@ -245,6 +273,16 @@
) || exit $?
%endif
+ # install GC-Utils add-on
+%if "%{with_gcutils}" == "yes"
+ ( cd gc-utils
+ %{l_make} %{l_mflags} \
+ prefix=$RPM_BUILD_ROOT%{l_prefix} \
+ mandir=$RPM_BUILD_ROOT%{l_prefix}/man \
+ install
+ ) || exit $?
+%endif
+
# strip down installation
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/doc
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
