cleanup packaging

git/git.patch

@@ -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-10-12 08:59:30 +0200
++++ cogito-0.18.2/Makefile	2009-10-18 10:41:19 +0200
 @@ -2,8 +2,8 @@
  prefix="$(HOME)"
  
@@ -14,7 +14,7 @@ Index: cogito-0.18.2/Makefile
  
 Index: gc-utils/doc/Makefile
 --- gc-utils/doc/Makefile.orig	2008-08-01 17:39:15 +0200
-+++ gc-utils/doc/Makefile	2009-10-12 08:59:30 +0200
++++ gc-utils/doc/Makefile	2009-10-18 10:41:19 +0200
 @@ -29,17 +29,17 @@
  
  .PHONY: gen install clean uninstall
@@ -38,8 +38,8 @@ Index: gc-utils/doc/Makefile
  
  uninstall:
 Index: git-1.6.5.1/Documentation/Makefile
---- git-1.6.5.1/Documentation/Makefile.orig	2009-10-11 03:42:04 +0200
-+++ git-1.6.5.1/Documentation/Makefile	2009-10-12 08:59:30 +0200
+--- git-1.6.5.1/Documentation/Makefile.orig	2009-10-17 10:11:32 +0200
++++ git-1.6.5.1/Documentation/Makefile	2009-10-18 10:41:19 +0200
 @@ -51,10 +51,10 @@
  infodir?=$(prefix)/share/info
  MAKEINFO=makeinfo
@@ -54,14 +54,17 @@ Index: git-1.6.5.1/Documentation/Makefile
  
  -include ../config.mak.autogen
 Index: git-1.6.5.1/Makefile
---- git-1.6.5.1/Makefile.orig	2009-10-11 03:42:04 +0200
-+++ git-1.6.5.1/Makefile	2009-10-12 08:59:52 +0200
-@@ -239,7 +239,7 @@
+--- git-1.6.5.1/Makefile.orig	2009-10-17 10:11:32 +0200
++++ git-1.6.5.1/Makefile	2009-10-18 10:41:19 +0200
+@@ -237,9 +237,9 @@
+ bindir = $(prefix)/$(bindir_relative)
+ mandir = share/man
  infodir = share/info
- gitexecdir = libexec/git-core
+-gitexecdir = libexec/git-core
++gitexecdir = libexec/git
  sharedir = $(prefix)/share
 -template_dir = share/git-core/templates
-+template_dir = share/git/core/templates
++template_dir = share/git/templates
  htmldir = share/doc/git-doc
  ifeq ($(prefix),/usr)
  sysconfdir = /etc
@@ -88,9 +91,24 @@ Index: git-1.6.5.1/Makefile
  	endif
  else
  	BASIC_CFLAGS += -DNO_OPENSSL
+Index: git-1.6.5.1/config.mak.in
+--- git-1.6.5.1/config.mak.in.orig	2009-10-17 10:11:32 +0200
++++ git-1.6.5.1/config.mak.in	2009-10-18 10:51:24 +0200
+@@ -13,9 +13,9 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ bindir = @bindir@
+-gitexecdir = @libexecdir@/git-core
++gitexecdir = @libexecdir@/git
+ datarootdir = @datarootdir@
+-template_dir = @datadir@/git-core/templates
++template_dir = @datadir@/git/templates
+ 
+ mandir=@mandir@
+ 
 Index: git-1.6.5.1/perl/Makefile.PL
---- git-1.6.5.1/perl/Makefile.PL.orig	2009-10-11 03:42:04 +0200
-+++ git-1.6.5.1/perl/Makefile.PL	2009-10-12 08:59:30 +0200
+--- git-1.6.5.1/perl/Makefile.PL.orig	2009-10-17 10:11:32 +0200
++++ git-1.6.5.1/perl/Makefile.PL	2009-10-18 10:41:19 +0200
 @@ -34,5 +34,6 @@
  	VERSION_FROM    => 'Git.pm',
  	PM		=> \%pm,
@@ -99,9 +117,21 @@ Index: git-1.6.5.1/perl/Makefile.PL
 +	INSTALLDIRS	=> 'vendor',
 +	INSTALLSITEMAN3DIR => '$(SITEPREFIX)/man/man3'
  );
+Index: git-1.6.5.1/templates/Makefile
+--- git-1.6.5.1/templates/Makefile.orig	2009-10-17 10:11:32 +0200
++++ git-1.6.5.1/templates/Makefile	2009-10-18 10:41:19 +0200
+@@ -8,7 +8,7 @@
+ TAR ?= tar
+ RM ?= rm -f
+ prefix ?= $(HOME)
+-template_instdir ?= $(prefix)/share/git-core/templates
++template_instdir ?= $(prefix)/share/git/templates
+ # DESTDIR=
+ 
+ # Shell quote (do not use $(call) to accommodate ancient setups);
 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-10-12 08:59:30 +0200
++++ stgit-0.14.3/setup.py	2009-10-18 10:41:19 +0200
 @@ -61,10 +61,10 @@
        long_description = 'Push/pop utility on top of GIT',
        scripts = ['stg'],
@@ -119,7 +149,7 @@ Index: stgit-0.14.3/setup.py
                      ('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-10-12 08:59:30 +0200
++++ stgit-0.14.3/stg	2009-10-18 10:41:19 +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])

git/git.spec

@@ -40,7 +40,7 @@ Class:        EVAL
 Group:        SCM
 License:      GPL
 Version:      %{V_git}
-Release:      20091017
+Release:      20091018
 
 #   package options
 %option       with_doc     yes
@@ -63,10 +63,20 @@ Patch0:       git.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20040130, bash, python, perl, gcc, make, perl-openpkg
-PreReq:       OpenPKG, openpkg >= 20040130, bash, python, perl, diffutils, rcs
+BuildPreReq:  OpenPKG, openpkg >= 20040130
+PreReq:       OpenPKG, openpkg >= 20040130
+BuildPreReq:  gcc, make, perl-openpkg
+%if "%{with_doc}" == "yes"
+BuildPreReq:  asciidoc, xmlto
+%endif
+BuildPreReq:  bash, perl, diffutils
+PreReq:       bash, perl, diffutils
 BuildPreReq:  zlib, openssl, curl, expat, libiconv
 PreReq:       zlib, openssl, curl, expat, libiconv
+%if "%{with_stgit}" == "yes"
+BuildPreReq:  python
+PreReq:       python
+%endif
 %if "%{with_tig}" == "yes"
 BuildPreReq:  ncurses
 PreReq:       ncurses
@@ -74,9 +84,6 @@ PreReq:       ncurses
 %if "%{with_gcutils}" == "yes"
 BuildPreReq:  gzip
 %endif
-%if "%{with_doc}" == "yes"
-BuildPreReq:  asciidoc, xmlto
-%endif
 AutoReq:      no
 AutoReqProv:  no
 
@@ -155,13 +162,15 @@ AutoReqProv:  no
           --with-expat=%{l_prefix} \
           --with-iconv=%{l_prefix} \
           --with-zlib=%{l_prefix} \
-          --with-perl=%{l_prefix}/bin/bash \
+          --with-bash=%{l_prefix}/bin/bash \
           --with-perl=%{l_prefix}/bin/perl \
           --without-tcltk \
           --disable-pthreads
       %{l_make} %{l_mflags}
 %if "%{with_doc}" == "yes"
-      ( cd Documentation; %{l_make} %{l_mflags} man ) || exit $?
+      ( cd Documentation
+        %{l_make} %{l_mflags} man
+      ) || exit $?
 %endif
     ) || exit $?