Accepting request 35104 from devel:tools:scm

Copy from devel:tools:scm/git based on submit request 35104 from user tiwai

OBS-URL: https://build.opensuse.org/request/show/35104
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=40

git-1.6.6.1.tar.bz2

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

git-1.7.0.2.tar.bz2

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

git-python-install-fix.diff

@@ -0,0 +1,15 @@
+---
+ git_remote_helpers/Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/git_remote_helpers/Makefile
++++ b/git_remote_helpers/Makefile
+@@ -25,7 +25,7 @@
+ 	$(QUIET)$(PYTHON_PATH) $(pysetupfile) $(QUIETSETUP) build
+ 
+ install: $(pysetupfile)
+-	$(PYTHON_PATH) $(pysetupfile) install --prefix $(DESTDIR_SQ)$(prefix)
++	$(PYTHON_PATH) $(pysetupfile) install --prefix $(prefix) --root $(DESTDIR_SQ)
+ 
+ instlibdir: $(pysetupfile)
+ 	@echo "$(DESTDIR_SQ)$(prefix)/$(PYLIBDIR)"

git.changes

@@ -1,3 +1,66 @@
+-------------------------------------------------------------------
+Mon Mar  8 08:40:02 CET 2010 - tiwai@suse.de
+
+- updated to git 1.7.0.2:
+  http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.0.2.txt
+
+-------------------------------------------------------------------
+Mon Mar  1 12:47:24 CET 2010 - tiwai@suse.de
+
+- updated to git 1.7.0.1; just a minor update
+  http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.0.1.txt
+
+-------------------------------------------------------------------
+Thu Feb 25 17:42:15 CET 2010 - tiwai@suse.de
+
+- don't use %py_requires macro, otherwise it add an implicit
+  dependency to git.rpm
+
+-------------------------------------------------------------------
+Sat Feb 20 19:16:04 UTC 2010 - jengelh@medozas.de
+
+- use %_smp_mflags, use %_libexecdir for gitexecdir
+
+-------------------------------------------------------------------
+Wed Feb 17 10:00:42 CET 2010 - tiwai@suse.de
+
+- fix installation of python stuff
+
+-------------------------------------------------------------------
+Mon Feb 15 09:31:29 CET 2010 - tiwai@suse.de
+
+- updated to version 1.7.0: Major update
+  See details in
+      http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.0.txt
+
+  Notes on behaviour change:
+  * "git push" into a branch that is currently checked out (i.e. pointed at by
+   HEAD in a repository that is not bare) is refused by default.
+ * "git send-email" does not make deep threads by default when sending a
+   patch series with more than two messages.  All messages will be sent
+   as a reply to the first message, i.e. cover letter.
+ * "git status" is not "git commit --dry-run" anymore.  This change does
+   not affect you if you run the command without argument.
+ * "git diff" traditionally treated various "ignore whitespace" options
+   only as a way to filter the patch output.  "git diff --exit-code -b"
+   exited with non-zero status even if all changes were about changing the
+   amount of whitespace and nothing else;  and "git diff -b" showed the
+   "diff --git" header line for such a change without patch text.
+ * External diff and textconv helpers are now executed using the shell.
+   This makes them consistent with other programs executed by git, and
+   allows you to pass command-line parameters to the helpers. Any helper
+   paths containing spaces or other metacharacters now need to be
+   shell-quoted.  The affected helpers are GIT_EXTERNAL_DIFF in the
+   environment, and diff.*.command and diff.*.textconv in the config
+   file.
+ * The --max-pack-size argument to 'git repack', 'git pack-objects', and
+   'git fast-import' was assuming the provided size to be expressed in MiB,
+   unlike the corresponding config variable and other similar options accepting
+   a size value.  It is now expecting a size expressed in bytes, with a possible
+   unit suffix of 'k', 'm', or 'g'.
+
+- added git-remote-helpers sub-package for python helpers
+
 -------------------------------------------------------------------
 Thu Jan 21 08:24:01 CET 2010 - tiwai@suse.de
 

git.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package git (Version 1.6.6.1)
+# spec file for package git (Version 1.7.0.2)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -16,7 +16,7 @@
 #
 
 
-%define gitexecdir %{_exec_prefix}/lib/git
+%define gitexecdir %_libexecdir/git
 
 Name:           git
 %if 0%{?suse_version} < 1030
@@ -36,7 +36,8 @@ BuildRequires:  libopenssl-devel
 %endif
 BuildRequires:  sgml-skel
 BuildRequires:  xmlto
-Version:        1.6.6.1
+BuildRequires:  python
+Version:        1.7.0.2
 Release:        1
 Summary:        Fast, scalable, distributed revision control system
 License:        GPLv2+
@@ -49,6 +50,7 @@ Source3:        git-daemon.init
 Source4:        git.xinetd
 Source5:        usr.share.git-web.gitweb.cgi
 Patch3:         git-nohardlink.diff
+Patch4:         git-python-install-fix.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       git-core = %{version}
 Recommends:     git-svn git-cvs git-email gitk git-gui git-web
@@ -242,9 +244,19 @@ Authors:
 --------
     Linus Torvalds <torvalds@osdl.org>
 
+%package remote-helpers
+License:        GPLv2+
+Summary:        Python package for remote helper scripts
+Group:          Development/Tools/Version Control
+Requires:       git-core = %{version}, python
+
+%description remote-helpers
+This package contains the building blocks for remote helpers written in Python.
+
 %prep
 %setup -q
 %patch3 -p1
+%patch4 -p1
 
 %build
 cat > .make <<'EOF'
@@ -261,7 +273,7 @@ make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
 EOF
 #
 chmod 755 .make
-./.make all %{?jobs:-j %jobs}
+./.make all %{?_smp_mflags}
 %{!?_without_docs: ./.make doc} 
 
 %install
@@ -405,6 +417,14 @@ fi
 /usr/share/git-web
 /etc/apparmor.d
 
+%files remote-helpers
+%defattr(-,root,root)
+%if %suse_version >= 1120
+%python_sitelib/*
+%else
+%py_sitedir/*
+%endif
+
 %files core -f bin-man-doc-files
 %defattr(-,root,root)
 %{_bindir}/git