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: 27-Jan-2007 22:16:02
Branch: HEAD Handle: 2007012721160001
Modified files:
openpkg-src/git git.patch git.spec
Log:
cleanup the whole package filesystem layout and install GIT web
interface, too
Summary:
Revision Changes Path
1.16 +58 -3 openpkg-src/git/git.patch
1.42 +65 -17 openpkg-src/git/git.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/git/git.patch
============================================================================
$ cvs diff -u -r1.15 -r1.16 git.patch
--- openpkg-src/git/git.patch 21 Dec 2006 07:47:44 -0000 1.15
+++ openpkg-src/git/git.patch 27 Jan 2007 21:16:00 -0000 1.16
@@ -1,6 +1,31 @@
-Index: Makefile
---- Makefile.orig 2006-12-20 21:11:12 +0100
-+++ Makefile 2006-12-21 08:44:54 +0100
+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-01-27 21:25:28 +0100
+@@ -2,8 +2,8 @@
+ prefix="$(HOME)"
+
+ bindir=$(prefix)/bin
+-libdir=$(prefix)/lib/cogito
+-sharedir=$(prefix)/share/cogito
++libdir=$(prefix)/lib/git/cogito
++sharedir=$(prefix)/share/git/cogito
+
+ INSTALL?=install
+
+Index: git-1.4.4.4/Makefile
+--- git-1.4.4.4/Makefile.orig 2007-01-08 04:14:44 +0100
++++ git-1.4.4.4/Makefile 2007-01-27 21:26:23 +0100
+@@ -115,8 +115,8 @@
+ prefix = $(HOME)
+ bindir = $(prefix)/bin
+ gitexecdir = $(bindir)
+-template_dir = $(prefix)/share/git-core/templates/
+-GIT_PYTHON_DIR = $(prefix)/share/git-core/python
++template_dir = $(prefix)/share/git/core/templates/
++GIT_PYTHON_DIR = $(prefix)/share/git/core/python
+ # DESTDIR=
+
+ # default configuration for gitweb
@@ -438,11 +438,10 @@
ifndef NO_CURL
@@ -16,3 +41,33 @@
endif
PROGRAMS += git-http-fetch$X
curl_check := $(shell (echo 070908; curl-config --vernum) | sort -r |
sed -ne 2p)
+Index: stgit-0.11/setup.py
+--- stgit-0.11/setup.py.orig 2006-10-21 10:38:55 +0200
++++ stgit-0.11/setup.py 2007-01-27 21:25:28 +0100
+@@ -15,9 +15,9 @@
+ long_description = 'Push/pop utility on top of GIT',
+ scripts = ['stg'],
+ packages = ['stgit', 'stgit.commands'],
+- data_files = [('share/stgit/templates',
glob.glob('templates/*.tmpl')),
+- ('share/stgit/examples', glob.glob('examples/*.tmpl')),
+- ('share/stgit/examples', ['examples/stgitrc']),
+- ('share/stgit/contrib', ['contrib/diffcol.sh']),
++ data_files = [('share/git/stgit/templates',
glob.glob('templates/*.tmpl')),
++ ('share/git/stgit/examples',
glob.glob('examples/*.tmpl')),
++ ('share/git/stgit/examples', ['examples/stgitrc']),
++ ('share/git/stgit/contrib', ['contrib/diffcol.sh']),
+ ('share/doc/stgit', glob.glob('doc/*.txt'))]
+ )
+Index: stgit-0.11/stg
+--- stgit-0.11/stg.orig 2006-04-07 23:38:54 +0200
++++ stgit-0.11/stg 2007-01-27 21:25:28 +0100
+@@ -31,7 +31,8 @@
+ sys.exec_prefix = prefix
+
+ major, minor = sys.version_info[0:2]
+- local_path = [os.path.join(prefix, 'lib', 'python'),
++ local_path = [os.path.join(prefix, 'lib', 'git'),
++ os.path.join(prefix, 'lib', 'python'),
+ os.path.join(prefix, 'lib', 'python%s.%s' % (major,
minor)),
+ os.path.join(prefix, 'lib', 'python%s.%s' % (major,
minor),
+ 'site-packages')]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/git/git.spec
============================================================================
$ cvs diff -u -r1.41 -r1.42 git.spec
--- openpkg-src/git/git.spec 22 Jan 2007 08:33:58 -0000 1.41
+++ openpkg-src/git/git.spec 27 Jan 2007 21:16:01 -0000 1.42
@@ -38,7 +38,7 @@
Group: SCM
License: GPL
Version: %{V_git}
-Release: 20070122
+Release: 20070127
# list of sources
Source0: http://www.kernel.org/pub/software/scm/git/git-%{V_git}.tar.gz
@@ -49,8 +49,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, bash, python, gcc, make
-PreReq: OpenPKG, openpkg >= 20040130, bash, python, diffutils, rcs,
perl
+BuildPreReq: OpenPKG, openpkg >= 20040130, bash, python, perl, gcc, make,
perl-openpkg
+PreReq: OpenPKG, openpkg >= 20040130, bash, python, perl, diffutils,
rcs
BuildPreReq: zlib, openssl, curl, expat, libiconv
PreReq: zlib, openssl, curl, expat, libiconv
AutoReq: no
@@ -88,28 +88,37 @@
%setup -q -c
%setup -q -T -D -a 1
%setup -q -T -D -a 2
- %patch -p0 -d git-%{V_git}
+ %patch -p0
%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 "prefix = %{l_prefix}"
+ ( 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 "prefix = %{l_prefix}"
) >config.mak
%{l_make} %{l_mflags}
) || exit $?
+
+ # build Cogito frontend
( cd cogito-%{V_cogito}
%{l_make} %{l_mflags} \
prefix=%{l_prefix}
@@ -117,24 +126,63 @@
%install
rm -rf $RPM_BUILD_ROOT
+
+ # install GIT core
( cd git-%{V_git}
%{l_make} %{l_mflags} install \
DESTDIR=$RPM_BUILD_ROOT
) || exit $?
+
+ # install GIT web interface
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/cgi/gitweb.d \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/git
+ %{l_shtool} install -c -m 755 \
+ git-%{V_git}/gitweb/gitweb.cgi $RPM_BUILD_ROOT%{l_prefix}/cgi/
+ %{l_shtool} install -c -m 755 \
+ git-%{V_git}/gitweb/gitweb.css \
+ git-%{V_git}/gitweb/git-favicon.png \
+ git-%{V_git}/gitweb/git-logo.png \
+ $RPM_BUILD_ROOT%{l_prefix}/cgi/gitweb.d/
+ ( echo "##"
+ echo "## gitweb.config.pl -- gitweb Perl configuration "
+ echo "##"
+ echo ""
+ echo "1;"
+ ) >gitweb.config.pl
+ %{l_shtool} install -c -m 755 \
+ gitweb.config.pl $RPM_BUILD_ROOT%{l_prefix}/etc/git/
+
+ # install GIT bash programmable completion
+ %{l_shtool} install -c -m 644 \
+ git-%{V_git}/contrib/completion/git-completion.bash \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/git/git.bashrc
+
+ # install Cogito frontend
( cd cogito-%{V_cogito}
%{l_make} %{l_mflags} install \
INSTALL="%{l_shtool} install" \
DESTDIR=$RPM_BUILD_ROOT \
prefix=%{l_prefix}
) || exit $?
+
+ # install StGIT add-on
( cd stgit-%{V_stgit}
%{l_prefix}/bin/python setup.py install \
--root=$RPM_BUILD_ROOT \
- --prefix=%{l_prefix}
+ --prefix=%{l_prefix} \
+ --install-lib=%{l_prefix}/lib/git
) || exit $?
+
+ # strip down installation
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}
+
+ # determine installation files
+ %{l_prefix}/bin/perl-openpkg -F perl-openpkg-files fixate cleanup
+ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+ %{l_files_std} `cat perl-openpkg-files` \
+ '%config %{l_prefix}/etc/git/*'
%files -f files
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
