Accepting request 501116 from devel:tools:scm

git 2.13.1 (forwarded request 501115 from AndreasStieger)

OBS-URL: https://build.opensuse.org/request/show/501116
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=198
This commit is contained in:
Dominique Leuenberger 2017-06-07 07:54:24 +00:00 committed by Git OBS Bridge
parent b18505bb0a
commit d891d26b60
6 changed files with 37 additions and 26 deletions

Binary file not shown.

View File

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

BIN
git-2.13.1.tar.sign Normal file

Binary file not shown.

3
git-2.13.1.tar.xz Normal file
View File

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

View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Mon Jun 5 08:43:05 UTC 2017 - astieger@suse.com
- git 2.13.1:
* Setting "log.decorate=false" in the configuration file did not
take effect in v2.13, which has been corrected.
* corrections to documentation and command help output
* garbage collection fixes
* memory leaks fixed
* receive-pack now makes sure that the push certificate records
the same set of push options used for pushing
* shell completion corrections for git stash
* fix "git clone --config var=val" with empty strings
* internal efficiency improvements
* Update sha1 collision detection code for big-endian platforms
and platforms not supporting unaligned fetches
-------------------------------------------------------------------
Sat May 27 12:49:47 UTC 2017 - schwab@linux-m68k.org
- Fix packaging of documentation
-------------------------------------------------------------------
Wed May 10 21:09:53 UTC 2017 - astieger@suse.com
@ -12,6 +34,8 @@ Wed May 10 21:09:53 UTC 2017 - astieger@suse.com
* now avoid blindly falling back to ".git" when the setup
sequence indicated otherwise
* many workflow features, improvements and bug fixes
* add a hardened implementation of SHA1 in response to practical
collision attacks (CVE-2005-4900, bsc#1042640)
-------------------------------------------------------------------
Wed May 10 07:54:52 UTC 2017 - astieger@suse.com

View File

@ -26,7 +26,7 @@
%endif
Name: git
Version: 2.13.0
Version: 2.13.1
Release: 0
Summary: Fast, scalable, distributed revision control system
License: GPL-2.0
@ -263,7 +263,7 @@ make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
V=1 \
prefix=%{_prefix} mandir=%{_mandir} \
gitexecdir=%{gitexecdir} \
htmldir=%{_docdir}/git-core \
htmldir=%{_docdir}/git \
"$@"
EOF
#
@ -301,7 +301,7 @@ install -m 644 %{S:6} $RPM_BUILD_ROOT/%{_fwdefdir}/git-daemon
%{!?_without_docs: ./.make -C contrib/subtree install-doc}
(find $RPM_BUILD_ROOT%{_bindir} -type f -o -type l | grep -vE "archimport|svn|cvs|email|gitk|git-daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files
(find $RPM_BUILD_ROOT%{gitexecdir} ! -type d | grep -vE "archimport|svn|cvs|email|gitk|git-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|git-daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
(find $RPM_BUILD_ROOT%{_mandir} -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
( pushd perl
perl Makefile.PL
make -f perl.mak DESTDIR=%{buildroot} install_vendor
@ -341,9 +341,13 @@ if ! test -f $RPM_BUILD_ROOT%{gitexecdir}/git-add; then
exit 1
fi
mkdir -p "%buildroot/%_docdir/git"
mkdir -p "%buildroot/%_docdir/git" "%buildroot/%_docdir/git/howto" "%buildroot/%_docdir/git/technical"
cp -a README.md COPYING Documentation/*.txt "%buildroot/%_docdir/git/"
cp -a Documentation/howto/*.txt "%buildroot/%_docdir/git/howto/"
cp -a Documentation/technical/*.txt "%buildroot/%_docdir/git/technical/"
%{!?_without_docs: cp -a Documentation/*.html "%buildroot/%_docdir/git/"}
%{!?_without_docs: cp -a Documentation/howto/*.html "%buildroot/%_docdir/git/howto/"}
%{!?_without_docs: cp -a Documentation/technical/*.html "%buildroot/%_docdir/git/technical/"}
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/applications
install -m 644 %{SOURCE9} $RPM_BUILD_ROOT%{_datadir}/applications
@ -383,21 +387,18 @@ fi
%defattr(-,root,root)
%_docdir/%name/
%exclude %_docdir/%name/README.md
%exclude %_docdir/%name/COPYING
%files svn
%defattr(-,root,root)
%{gitexecdir}/*svn*
%doc Documentation/*svn*.txt
%{!?_without_docs: %{_mandir}/man1/*svn*.1*}
%{!?_without_docs: %doc Documentation/*svn*.html }
%files cvs
%defattr(-,root,root)
%doc Documentation/*git-cvs*.txt
%{_bindir}/git-cvs*
%{gitexecdir}/*cvs*
%{!?_without_docs: %{_mandir}/man1/*cvs*.1*}
%{!?_without_docs: %doc Documentation/*git-cvs*.html }
%if %{with git_gnome_keyring}
%files credential-gnome-keyring
@ -407,46 +408,36 @@ fi
%files arch
%defattr(-,root,root)
%doc Documentation/git-archimport.txt
%{gitexecdir}/git-archimport
%{!?_without_docs: %{_mandir}/man1/git-archimport.1*}
%{!?_without_docs: %doc Documentation/git-archimport.html }
%files email
%defattr(-,root,root)
%doc Documentation/*email*.txt
%{gitexecdir}/*email*
%{!?_without_docs: %{_mandir}/man1/*email*.1*}
%{!?_without_docs: %doc Documentation/*email*.html }
%files daemon
%defattr(-,root,root)
%doc Documentation/git-daemon.txt
%{gitexecdir}/git-daemon
/etc/init.d/git-daemon
%{_sbindir}/rcgit-daemon
%dir /srv/git
/var/adm/fillup-templates/sysconfig.git-daemon
%{!?_without_docs: %{_mandir}/man1/git-daemon.1*}
%{!?_without_docs: %doc Documentation/git-daemon.html }
%config(noreplace) /etc/xinetd.d/git
%config %{_fwdefdir}/*
%files -n gitk
%defattr(-,root,root)
%doc Documentation/*gitk*.txt
%{_bindir}/gitk
/usr/share/gitk
%{!?_without_docs: %{_mandir}/man1/*gitk*.1*}
%{!?_without_docs: %doc Documentation/*gitk*.html }
%files gui
%defattr(-,root,root)
%doc Documentation/*gui*.txt
%{gitexecdir}/git-gui*
/usr/share/git-gui
%{!?_without_docs: %{_mandir}/man1/*gui*.1*}
%{!?_without_docs: %doc Documentation/*gui*.html }
%{_datadir}/applications/%{name}-gui.desktop
%{_datadir}/pixmaps/%{name}-gui.png
@ -459,7 +450,6 @@ fi
%files core -f bin-man-doc-files
%defattr(-,root,root)
%doc %{_docdir}/git-core/
%{_datadir}/git-core/
%dir %{gitexecdir}
%dir %{gitexecdir}/mergetools
@ -474,9 +464,6 @@ fi
/usr/share/tcsh
/etc/profile.d/*.csh
/etc/zsh_completion.d
%doc README.md COPYING Documentation/*.txt
%{!?_without_docs: %doc Documentation/*.html Documentation/howto}
%{!?_without_docs: %doc Documentation/technical}
%doc %{_docdir}/%name/COPYING
%changelog