upgrading package: git 1.7.1.1 -> 1.7.2

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-11-23 08:51:14 +0100
+--- cogito-0.18.2/Makefile.orig	2006-11-17 01:37:24.000000000 +0100
++++ cogito-0.18.2/Makefile	2010-07-22 09:56:28.000000000 +0200
 @@ -2,8 +2,8 @@
  prefix="$(HOME)"
  
@@ -13,8 +13,8 @@ Index: cogito-0.18.2/Makefile
  INSTALL?=install
  
 Index: gc-utils/doc/Makefile
---- gc-utils/doc/Makefile.orig	2008-08-01 17:39:15 +0200
-+++ gc-utils/doc/Makefile	2009-11-23 08:51:14 +0100
+--- gc-utils/doc/Makefile.orig	2008-08-01 17:39:15.000000000 +0200
++++ gc-utils/doc/Makefile	2010-07-22 09:56:28.000000000 +0200
 @@ -29,17 +29,17 @@
  
  .PHONY: gen install clean uninstall
@@ -37,10 +37,10 @@ Index: gc-utils/doc/Makefile
  endif
  
  uninstall:
-Index: git-1.7.1.1/Documentation/Makefile
---- git-1.7.1.1/Documentation/Makefile.orig	2009-11-16 23:14:46 +0100
-+++ git-1.7.1.1/Documentation/Makefile	2009-11-23 08:51:14 +0100
-@@ -51,10 +51,10 @@
+Index: git-1.7.2/Documentation/Makefile
+--- git-1.7.2/Documentation/Makefile.orig	2010-07-21 23:35:25.000000000 +0200
++++ git-1.7.2/Documentation/Makefile	2010-07-22 09:56:28.000000000 +0200
+@@ -52,10 +52,10 @@
  infodir?=$(prefix)/share/info
  MAKEINFO=makeinfo
  INSTALL_INFO=install-info
@@ -53,22 +53,23 @@ Index: git-1.7.1.1/Documentation/Makefile
  endif
  
  -include ../config.mak.autogen
-Index: git-1.7.1.1/Makefile
---- git-1.7.1.1/Makefile.orig	2009-11-16 23:14:46 +0100
-+++ git-1.7.1.1/Makefile	2009-11-23 08:51:14 +0100
-@@ -241,9 +241,9 @@
+Index: git-1.7.2/Makefile
+--- git-1.7.2/Makefile.orig	2010-07-21 23:35:25.000000000 +0200
++++ git-1.7.2/Makefile	2010-07-22 10:04:28.000000000 +0200
+@@ -278,10 +278,10 @@
  bindir = $(prefix)/$(bindir_relative)
  mandir = share/man
  infodir = share/info
 -gitexecdir = libexec/git-core
 +gitexecdir = libexec/git
  sharedir = $(prefix)/share
+ gitwebdir = $(sharedir)/gitweb
 -template_dir = share/git-core/templates
 +template_dir = share/git/templates
  htmldir = share/doc/git-doc
  ifeq ($(prefix),/usr)
  sysconfdir = /etc
-@@ -1050,10 +1050,10 @@
+@@ -1195,10 +1195,10 @@
  else
  	ifdef CURLDIR
  		# Try "-Wl,-rpath=$(CURLDIR)/$(lib)" in such a case.
@@ -80,9 +81,9 @@ Index: git-1.7.1.1/Makefile
 -		CURL_LIBCURL = -lcurl
 +		CURL_LIBCURL = -lcurl -lssl -lcrypto
  	endif
- 	PROGRAMS += git-remote-curl$X git-http-fetch$X
- 	curl_check := $(shell (echo 070908; curl-config --vernum) | sort -r | sed -ne 2p)
-@@ -1091,7 +1091,7 @@
+ 	REMOTE_CURL_PRIMARY = git-remote-http$X
+ 	REMOTE_CURL_ALIASES = git-remote-https$X git-remote-ftp$X git-remote-ftps$X
+@@ -1239,7 +1239,7 @@
  		OPENSSL_LINK =
  	endif
  	ifdef NEEDS_CRYPTO_WITH_SSL
@@ -91,10 +92,10 @@ Index: git-1.7.1.1/Makefile
  	endif
  else
  	BASIC_CFLAGS += -DNO_OPENSSL
-Index: git-1.7.1.1/config.mak.in
---- git-1.7.1.1/config.mak.in.orig	2009-11-16 23:14:46 +0100
-+++ git-1.7.1.1/config.mak.in	2009-11-23 08:51:14 +0100
-@@ -13,9 +13,9 @@
+Index: git-1.7.2/config.mak.in
+--- git-1.7.2/config.mak.in.orig	2010-07-21 23:35:25.000000000 +0200
++++ git-1.7.2/config.mak.in	2010-07-22 09:56:28.000000000 +0200
+@@ -15,9 +15,9 @@
  prefix = @prefix@
  exec_prefix = @exec_prefix@
  bindir = @bindir@
@@ -106,9 +107,9 @@ Index: git-1.7.1.1/config.mak.in
  
  mandir=@mandir@
  
-Index: git-1.7.1.1/perl/Makefile.PL
---- git-1.7.1.1/perl/Makefile.PL.orig	2009-11-16 23:14:46 +0100
-+++ git-1.7.1.1/perl/Makefile.PL	2009-11-23 08:51:14 +0100
+Index: git-1.7.2/perl/Makefile.PL
+--- git-1.7.2/perl/Makefile.PL.orig	2010-07-21 23:35:25.000000000 +0200
++++ git-1.7.2/perl/Makefile.PL	2010-07-22 09:56:28.000000000 +0200
 @@ -34,5 +34,6 @@
  	VERSION_FROM    => 'Git.pm',
  	PM		=> \%pm,
@@ -117,9 +118,9 @@ Index: git-1.7.1.1/perl/Makefile.PL
 +	INSTALLDIRS	=> 'vendor',
 +	INSTALLSITEMAN3DIR => '$(SITEPREFIX)/man/man3'
  );
-Index: git-1.7.1.1/templates/Makefile
---- git-1.7.1.1/templates/Makefile.orig	2009-11-16 23:14:46 +0100
-+++ git-1.7.1.1/templates/Makefile	2009-11-23 08:51:14 +0100
+Index: git-1.7.2/templates/Makefile
+--- git-1.7.2/templates/Makefile.orig	2010-07-21 23:35:25.000000000 +0200
++++ git-1.7.2/templates/Makefile	2010-07-22 09:56:28.000000000 +0200
 @@ -8,7 +8,7 @@
  TAR ?= tar
  RM ?= rm -f
@@ -128,10 +129,10 @@ Index: git-1.7.1.1/templates/Makefile
 +template_instdir ?= $(prefix)/share/git/templates
  # DESTDIR=
  
- # Shell quote (do not use $(call) to accommodate ancient setups);
+ ifndef SHELL_PATH
 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-11-23 08:51:14 +0100
+--- stgit-0.14.3/setup.py.orig	2008-06-09 00:26:03.000000000 +0200
++++ stgit-0.14.3/setup.py	2010-07-22 09:56:28.000000000 +0200
 @@ -61,10 +61,10 @@
        long_description = 'Push/pop utility on top of GIT',
        scripts = ['stg'],
@@ -148,8 +149,8 @@ Index: stgit-0.14.3/setup.py
                                               'contrib/stgit-completion.bash']),
                      ('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-11-23 08:51:14 +0100
+--- stgit-0.14.3/stg.orig	2006-04-07 23:38:54.000000000 +0200
++++ stgit-0.14.3/stg	2010-07-22 09:56:28.000000000 +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

@@ -22,7 +22,7 @@
 ##
 
 #   package version
-%define       V_git       1.7.1.1
+%define       V_git       1.7.2
 %define       V_cogito    0.18.2
 %define       V_stgit     0.14.3
 %define       V_guilt     0.33
@@ -40,7 +40,7 @@ Class:        EVAL
 Group:        SCM
 License:      GPL
 Version:      %{V_git}
-Release:      20100630
+Release:      20100722
 
 #   package options
 %option       with_doc     no
@@ -141,9 +141,10 @@ BuildPreReq:  gzip
           -e 's;struct option;struct git_option;g'
       ( 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_CSS            = /openpkg-cgi/gitweb.d/static/gitweb.css"
+        echo "GITWEB_JS             = /openpkg-cgi/gitweb.d/static/gitweb.js"
+        echo "GITWEB_LOGO           = /openpkg-cgi/gitweb.d/static/git-logo.png"
+        echo "GITWEB_FAVICON        = /openpkg-cgi/gitweb.d/static/git-favicon.png"
         echo "GITWEB_PROJECTROOT    = %{l_prefix}/var/git"
         echo "PYTHON_PATH           = %{l_prefix}/bin/python"
         echo "NEEDS_CRYPTO_WITH_SSL = YesPlease"
@@ -237,15 +238,13 @@ BuildPreReq:  gzip
 
     #   install GIT web interface
     %{l_shtool} mkdir -f -p -m 755 \
-        $RPM_BUILD_ROOT%{l_prefix}/cgi/gitweb.d \
+        $RPM_BUILD_ROOT%{l_prefix}/cgi/gitweb.d/static \
         $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/
+    %{l_shtool} install -c -m 644 \
+        git-%{V_git}/gitweb/static/* \
+        $RPM_BUILD_ROOT%{l_prefix}/cgi/gitweb.d/static/
     (   echo "##"
         echo "##  gitweb.config.pl -- gitweb Perl configuration "
         echo "##"