Accepting request 196442 from devel:tools:scm

update to version 1.8.4 (forwarded request 196338 from douglarek)

OBS-URL: https://build.opensuse.org/request/show/196442
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=118
This commit is contained in:
Stephan Kulow 2013-08-27 18:44:30 +00:00 committed by Git OBS Bridge
parent 545f3d1c69
commit 97d7174b6a
5 changed files with 23 additions and 16 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dfa2cdf2df92b4abe956b1e7586030381c4e39e89161ab789a660d8d1f24d9d9
size 4479898

3
git-1.8.4.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:51e8522c256ef8091c6fd5846b9cef8ba4e764819193b5b6cec570f530e6cb94
size 4657759

View File

@ -1,21 +1,20 @@
---
Makefile | 2 +-
git_remote_helpers/Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- a/Makefile
+++ b/Makefile
@@ -1797,7 +1797,7 @@ $(patsubst %.py,%,$(SCRIPT_PYTHON)): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
$(patsubst %.py,%,$(SCRIPT_PYTHON)): % : %.py
Index: git-1.8.4/Makefile
===================================================================
--- git-1.8.4/Makefile.orig 2013-08-24 03:38:43.000000000 +0800
+++ git-1.8.4/Makefile 2013-08-26 09:46:14.596687535 +0800
@@ -1838,7 +1838,7 @@ $(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PRE
$(SCRIPT_PYTHON_GEN): % : %.py
$(QUIET_GEN)$(RM) $@ $@+ && \
INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C git_remote_helpers -s \
- --no-print-directory prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' \
+ --no-print-directory prefix='$(prefix_SQ)' DESTDIR=\
+ --no-print-directory prefix='$(prefix_SQ)' DESTDIR= \
instlibdir` && \
sed -e '1s|#!.*python|#!$(PYTHON_PATH_SQ)|' \
-e 's|\(os\.getenv("GITPYTHONLIB"\)[^)]*)|\1,"@@INSTLIBDIR@@")|' \
--- a/git_remote_helpers/Makefile
+++ b/git_remote_helpers/Makefile
Index: git-1.8.4/git_remote_helpers/Makefile
===================================================================
--- git-1.8.4/git_remote_helpers/Makefile.orig 2013-08-24 03:38:43.000000000 +0800
+++ git-1.8.4/git_remote_helpers/Makefile 2013-08-26 09:47:37.941682649 +0800
@@ -35,7 +35,7 @@ all: $(pysetupfile)
$(QUIET)echo "$(py_version)" >GIT-PYTHON-VERSION

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Aug 26 01:36:57 UTC 2013 - douglarek@outlook.com
- updated to version 1.8.4:
more details, please see here:
https://raw.github.com/git/git/master/Documentation/RelNotes/1.8.4.txt
-------------------------------------------------------------------
Fri Aug 9 08:09:04 UTC 2013 - douglarek@outlook.com

View File

@ -20,7 +20,7 @@
%define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
Name: git
Version: 1.8.3.4
Version: 1.8.4
Release: 0
Summary: Fast, scalable, distributed revision control system
License: GPL-2.0