From dad6b215287e612f4e673029ab6c9c107751996e195387fc50f4eb96a55798ef Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 11 Oct 2010 12:44:17 +0000 Subject: [PATCH] Accepting request 50188 from devel:tools:scm Copy from devel:tools:scm/git based on submit request 50188 from user coolo OBS-URL: https://build.opensuse.org/request/show/50188 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=46 --- cgit.changes | 12 ++++++++++++ cgit.spec | 4 ++-- git-1.7.2.2.tar.bz2 | 3 --- git-1.7.3.1.tar.bz2 | 3 +++ git-nohardlink.diff | 4 ++-- git-python-install-fix.diff | 2 +- git.changes | 12 ++++++++++++ git.spec | 5 +++-- 8 files changed, 35 insertions(+), 10 deletions(-) delete mode 100644 git-1.7.2.2.tar.bz2 create mode 100644 git-1.7.3.1.tar.bz2 diff --git a/cgit.changes b/cgit.changes index d121948..73cdb78 100644 --- a/cgit.changes +++ b/cgit.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Sep 30 08:21:27 CEST 2010 - tiwai@suse.de + +- updated to git 1.7.3: + major version update; new options and behavior for git-rebase, + git-clean, git-checkout, git-gui. + See release note: + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.3.txt +- updated to git 1.7.3.1: + fix git-stash breakages +- Set NO_CROSS_DIRECTORY_HARDLINKS=1 to satisfy BS + ------------------------------------------------------------------- Fri Aug 20 17:41:32 CEST 2010 - anschneider@exsuse.de diff --git a/cgit.spec b/cgit.spec index 2596de3..1c99ca2 100644 --- a/cgit.spec +++ b/cgit.spec @@ -17,7 +17,7 @@ # norootforbuild -%define git_version 1.7.2.2 +%define git_version 1.7.3.1 Name: cgit Url: http://hjemli.net/git/cgit/ @@ -25,7 +25,7 @@ License: GPLv2 Group: Development/Libraries/C and C++ AutoReqProv: on Version: 0.8.3.3 -Release: 1 +Release: 2 Summary: A web frontend for git repositories Source0: %{name}-%{version}.tar.bz2 Source1: git-%{git_version}.tar.bz2 diff --git a/git-1.7.2.2.tar.bz2 b/git-1.7.2.2.tar.bz2 deleted file mode 100644 index 7917525..0000000 --- a/git-1.7.2.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9ea4936f04f56426e8b643d22caeb9e1d1e5a5b28111fcd3839b6735b3610a66 -size 2564964 diff --git a/git-1.7.3.1.tar.bz2 b/git-1.7.3.1.tar.bz2 new file mode 100644 index 0000000..c3ed495 --- /dev/null +++ b/git-1.7.3.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d0ac26b1bf3ec5af0853730a10edf9dc5f51a99d7590ab85676928bc3a44dae9 +size 2629723 diff --git a/git-nohardlink.diff b/git-nohardlink.diff index cf4bbef..c0a46e5 100644 --- a/git-nohardlink.diff +++ b/git-nohardlink.diff @@ -6,8 +6,8 @@ hardlinks to symlinks again in an unpredicatable way --- a/Makefile +++ b/Makefile -@@ -2081,7 +2081,6 @@ - cp "$$bindir/git$X" "$$execdir/git$X"; } ; } && \ +@@ -2133,7 +2133,6 @@ + done && \ for p in $(BUILT_INS); do \ $(RM) "$$execdir/$$p" && \ - ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \ diff --git a/git-python-install-fix.diff b/git-python-install-fix.diff index a7e50e3..b0f87f5 100644 --- a/git-python-install-fix.diff +++ b/git-python-install-fix.diff @@ -16,7 +16,7 @@ @echo "$(DESTDIR_SQ)$(prefix)/$(PYLIBDIR)" --- a/Makefile +++ b/Makefile -@@ -1700,7 +1700,7 @@ +@@ -1718,7 +1718,7 @@ $(patsubst %.py,%,$(SCRIPT_PYTHON)): % : %.py $(QUIET_GEN)$(RM) $@ $@+ && \ INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C git_remote_helpers -s \ diff --git a/git.changes b/git.changes index 7623e0f..242020b 100644 --- a/git.changes +++ b/git.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Sep 30 08:21:27 CEST 2010 - tiwai@suse.de + +- updated to git 1.7.3: + major version update; new options and behavior for git-rebase, + git-clean, git-checkout, git-gui. + See release note: + http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.3.txt +- updated to git 1.7.3.1: + fix git-stash breakages +- Set NO_CROSS_DIRECTORY_HARDLINKS=1 to satisfy BS + ------------------------------------------------------------------- Fri Aug 20 09:54:04 CEST 2010 - tiwai@suse.de diff --git a/git.spec b/git.spec index 0faebb3..1f55a9e 100644 --- a/git.spec +++ b/git.spec @@ -1,5 +1,5 @@ # -# spec file for package git (Version 1.7.2.2) +# spec file for package git (Version 1.7.3.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -38,7 +38,7 @@ BuildRequires: sgml-skel BuildRequires: xmlto BuildRequires: python BuildRequires: perl-Error -Version: 1.7.2.2 +Version: 1.7.3.1 Release: 1 Summary: Fast, scalable, distributed revision control system License: GPLv2+ @@ -271,6 +271,7 @@ make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ GITWEB_PROJECTROOT="/srv/git" \ WITH_OWN_SUBPROCESS_PY=YesPlease \ DESTDIR=$RPM_BUILD_ROOT \ + NO_CROSS_DIRECTORY_HARDLINKS=1 \ V=1 \ prefix=%{_prefix} mandir=%{_mandir} \ gitexecdir=%{gitexecdir} \