From 1156aa787c331be5bdaf8006adffc190640e8cf40f1751b7f5f4e6664c1f705f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sun, 12 Aug 2012 13:25:28 +0000 Subject: [PATCH] Accepting request 130617 from devel:tools:scm - updated to version 1.7.11: Major version update; added new options in many commands and new push mode like "simple" See Documentation/RelNotes/1.7.11.txt for details. - updated to version 1.7.11.1, 1.7.11.2, 1.7.11.3, 1.7.11.4: Contains many minor fixes, see below for details Documentation/RelNotes/1.7.11.1.txt Documentation/RelNotes/1.7.11.2.txt Documentation/RelNotes/1.7.11.3.txt Documentation/RelNotes/1.7.11.4.txt (forwarded request 130392 from tiwai) OBS-URL: https://build.opensuse.org/request/show/130617 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=88 --- git-1.7.10.4.tar.gz | 3 --- git-1.7.11.4.tar.gz | 3 +++ git-nohardlink.diff | 16 ---------------- git.changes | 15 +++++++++++++++ git.spec | 9 ++++----- 5 files changed, 22 insertions(+), 24 deletions(-) delete mode 100644 git-1.7.10.4.tar.gz create mode 100644 git-1.7.11.4.tar.gz delete mode 100644 git-nohardlink.diff diff --git a/git-1.7.10.4.tar.gz b/git-1.7.10.4.tar.gz deleted file mode 100644 index d9f1407..0000000 --- a/git-1.7.10.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:77ce53644d687202c64ca29db4ae5055daff4e0c611dde8f1d51edb752dba8dd -size 3813469 diff --git a/git-1.7.11.4.tar.gz b/git-1.7.11.4.tar.gz new file mode 100644 index 0000000..0283e58 --- /dev/null +++ b/git-1.7.11.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e91d6d2552d2def0e1431feb2e521fb40c0722f6ceff965592027153447d4199 +size 4018914 diff --git a/git-nohardlink.diff b/git-nohardlink.diff deleted file mode 100644 index cf9eed1..0000000 --- a/git-nohardlink.diff +++ /dev/null @@ -1,16 +0,0 @@ -don't use hardlinks as our .spec calls fdupes which converts the -hardlinks to symlinks again in an unpredicatable way ---- - Makefile | 1 - - 1 file changed, 1 deletion(-) - ---- a/Makefile -+++ b/Makefile -@@ -2252,7 +2252,6 @@ - done && \ - for p in $(BUILT_INS); do \ - $(RM) "$$execdir/$$p" && \ -- ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \ - ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \ - cp "$$execdir/git$X" "$$execdir/$$p" || exit; \ - done && \ diff --git a/git.changes b/git.changes index ef61f72..ddbe672 100644 --- a/git.changes +++ b/git.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Aug 7 14:48:24 CEST 2012 - tiwai@suse.de + +- updated to version 1.7.11: + Major version update; added new options in many commands and + new push mode like "simple" + See Documentation/RelNotes/1.7.11.txt for details. + +- updated to version 1.7.11.1, 1.7.11.2, 1.7.11.3, 1.7.11.4: + Contains many minor fixes, see below for details + Documentation/RelNotes/1.7.11.1.txt + Documentation/RelNotes/1.7.11.2.txt + Documentation/RelNotes/1.7.11.3.txt + Documentation/RelNotes/1.7.11.4.txt + ------------------------------------------------------------------- Tue Jun 5 11:43:40 CEST 2012 - tiwai@suse.de diff --git a/git.spec b/git.spec index f6688bc..6d713e1 100644 --- a/git.spec +++ b/git.spec @@ -30,7 +30,7 @@ BuildRequires: perl-Error BuildRequires: python BuildRequires: sgml-skel BuildRequires: xmlto -Version: 1.7.10.4 +Version: 1.7.11.4 Release: 0 Summary: Fast, scalable, distributed revision control system License: GPL-2.0 @@ -43,7 +43,6 @@ Source3: git-daemon.init Source4: git.xinetd Source5: usr.share.git-web.gitweb.cgi Source6: susefirewall-git-daemon -Patch1: git-nohardlink.diff Patch2: git-python-install-fix.diff Patch3: completion-wordbreaks.diff # CVE-2011-2186, bnc#698456 @@ -187,7 +186,6 @@ This package contains the building blocks for remote helpers written in Python. %prep %setup -q -%patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 @@ -201,6 +199,7 @@ make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ WITH_OWN_SUBPROCESS_PY=YesPlease \ DESTDIR=$RPM_BUILD_ROOT \ NO_CROSS_DIRECTORY_HARDLINKS=1 \ + NO_INSTALL_HARDLINKS=1 \ V=1 \ prefix=%{_prefix} mandir=%{_mandir} \ gitexecdir=%{gitexecdir} \ @@ -233,7 +232,7 @@ install -m 644 %{S:4} $RPM_BUILD_ROOT/etc/xinetd.d/git mkdir -p $RPM_BUILD_ROOT/%{_fwdefdir} install -m 644 %{S:6} $RPM_BUILD_ROOT/%{_fwdefdir}/git-daemon ### -(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files +(find $RPM_BUILD_ROOT%{_bindir} -type f -o -type l | grep -vE "archimport|svn|cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files (find $RPM_BUILD_ROOT%{gitexecdir} -mindepth 1 | grep -vE "archimport|svn|cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@) >> bin-man-doc-files (find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files ( pushd perl @@ -251,7 +250,7 @@ install -d -m 755 $RPM_BUILD_ROOT/etc/apparmor.d install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/apparmor.d # # create predictable symlinks to make apparmor profile work -for i in git git-upload-archive; do +for i in git git-upload-archive git-receive-pack; do rm $RPM_BUILD_ROOT%{_bindir}/$i ln -s %{gitexecdir}/git-add $RPM_BUILD_ROOT%{_bindir}/$i done