Преглед на файлове

modifying package: git-1.4.4.4 20070127 -> 20070207

Ralf S. Engelschall преди 19 години
родител
ревизия
85ef4dcde6
променени са 2 файла, в които са добавени 17 реда и са изтрити 16 реда
  1. 15 14
      git/git.patch
  2. 2 2
      git/git.spec

+ 15 - 14
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	2007-01-27 21:25:28 +0100
++++ cogito-0.18.2/Makefile	2007-02-07 08:58:03 +0100
 @@ -2,8 +2,8 @@
  prefix="$(HOME)"
  
@@ -14,7 +14,7 @@ Index: cogito-0.18.2/Makefile
  
 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
++++ git-1.4.4.4/Makefile	2007-02-07 08:58:03 +0100
 @@ -115,8 +115,8 @@
  prefix = $(HOME)
  bindir = $(prefix)/bin
@@ -41,26 +41,27 @@ Index: git-1.4.4.4/Makefile
  	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 @@
+Index: stgit-0.12/setup.py
+--- stgit-0.12/setup.py.orig	2007-01-25 23:49:37 +0100
++++ stgit-0.12/setup.py	2007-02-07 08:59:12 +0100
+@@ -15,10 +15,10 @@
        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']),
+-                    ('share/stgit/examples', ['examples/gitconfig']),
+-                    ('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/git/stgit/examples', ['examples/gitconfig']),
++                    ('share/git/stgit/contrib', ['contrib/diffcol.sh',
+                                              'contrib/stgbashprompt.sh',
+                                              'contrib/stgit-completion.bash']),
                      ('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
+Index: stgit-0.12/stg
+--- stgit-0.12/stg.orig	2006-04-07 23:38:54 +0200
++++ stgit-0.12/stg	2007-02-07 08:58:03 +0100
 @@ -31,7 +31,8 @@
      sys.exec_prefix = prefix
  

+ 2 - 2
git/git.spec

@@ -25,7 +25,7 @@
 #   package version
 %define       V_git       1.4.4.4
 %define       V_cogito    0.18.2
-%define       V_stgit     0.11
+%define       V_stgit     0.12
 
 #   package information
 Name:         git
@@ -38,7 +38,7 @@ Class:        EVAL
 Group:        SCM
 License:      GPL
 Version:      %{V_git}
-Release:      20070127
+Release:      20070207
 
 #   list of sources
 Source0:      http://www.kernel.org/pub/software/scm/git/git-%{V_git}.tar.gz