From 11facd4c4b52b5a094c29cf4add35024a108e69d34359c8df12311a67a08252c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 9 Jun 2021 19:54:51 +0000 Subject: [PATCH] Accepting request 897976 from devel:tools:scm OBS-URL: https://build.opensuse.org/request/show/897976 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=265 --- git-2.31.1.tar.sign | Bin 566 -> 0 bytes git-2.31.1.tar.xz | 3 --- git-2.32.0.tar.sign | Bin 0 -> 566 bytes git-2.32.0.tar.xz | 3 +++ git.changes | 23 +++++++++++++++++++++++ git.spec | 28 ++++++++++++++-------------- 6 files changed, 40 insertions(+), 17 deletions(-) delete mode 100644 git-2.31.1.tar.sign delete mode 100644 git-2.31.1.tar.xz create mode 100644 git-2.32.0.tar.sign create mode 100644 git-2.32.0.tar.xz diff --git a/git-2.31.1.tar.sign b/git-2.31.1.tar.sign deleted file mode 100644 index dbb633c2f8fafb29180167b8b8841e05a00d53317ce7c99c9d38e747368b77b9..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+c>-cu^muTXjIE7BX-*Mjz8wfo|on9qK!_|;_@wIMo`fFIMqo5~RC zklf=4d%pqv1YG|${Y_tB4q?jPxoa8?zBYd*2-)6IVlm%SQ9`J>EWvMJrOHx~3Cj(W z_+GMBYa96y+`&Zb2UjDh1V@-L(;7uczWdUGU9-5+GUuD$*{izM0=`Kp%cle+9hMOj z-O$1EgmiQO49?66aQJyR8B(*ws4ZcO1fc!y$C*}guUpejck=xKKz6|?h6tPqE?l$& z0*0>C_yc~SN;{zc_0A(#zQA2k(!KXyljtv&??Qf53xB^6%264GFD+{sO&Dcb)y{sf zpw)v>>)PNFXWpX37U4c^PGjJk6U_VPwCFm-c!0&n=3&W3`7>k-Nz731>!%$MvR~8o zeCp*lwQpUww45j1RVs`L1$l*BsVR%?P!SvLHq{kho8mr-{nW+1wyRUYKFzYbisqqN zDXbMC@}LfY5d$k?kb%BW+;vo1l<$)6HAAgBcmex;p|B&jKZiqW$C2631Va}nujn0i z7r?)JH@T%~(@DTKR&$5NE`|F>!24v6lV`N_Qr5avAAR_p3o8CQD-Hb;vW%vogorAj zAhTjQ)r~G9s_hSk$B(a}#6?{sjr`5%S6aVZ*PnfkPq83GD1e^`5!<`VrWk?C=v)$k E-u(U?F8}}l diff --git a/git-2.31.1.tar.xz b/git-2.31.1.tar.xz deleted file mode 100644 index ad9edfc..0000000 --- a/git-2.31.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9f61417a44d5b954a5012b6f34e526a3336dcf5dd720e2bb7ada92ad8b3d6680 -size 6413368 diff --git a/git-2.32.0.tar.sign b/git-2.32.0.tar.sign new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..6de14e393a6e627d6ae2231c0c33509d4cbec22449ddd141b360c5b71478534e GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+cI;*a)vE_py_{yom$(S#P^81A${`{VIJ_BG&=!Z zikHY8bk}9q&UWt>o5XfIY~(5>urq>FCPgcjW7q=fIw1N>7Mu?eoc770MB>NM1+6$$0)CK8?_$+ZzyR4E<$Q;sANbnDq`3Y3ad?tb_gt{qaMw^Oy zt*y5jFt{NnlIul}P&M-<|NHtNM|@_=${mg_fOQJS&*UABqFqe|{7raf7q4g-5IN2) zwjH^AVI=H4c8Q1CbznY{i>io-J%Y04Df9)nPp@r|wzZ{_qtpLK@{j4tj{Gi81}T^3 zV2lIFEWGZ5d%wY!)Hr<3v7k2lg8j$NAO>$PUY1vt;n^mD(!Dz&c&BMd>}|JxdKqG( zC8BdCzJvB5eb;^}#$3%DdLCx1K9p`&&Gfc7uC~HudFZD|XpQ#Ys=&Z9>_p+Clxt(; E=~bp4vH$=8 literal 0 HcmV?d00001 diff --git a/git-2.32.0.tar.xz b/git-2.32.0.tar.xz new file mode 100644 index 0000000..705fcc5 --- /dev/null +++ b/git-2.32.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68a841da3c4389847ecd3301c25eb7e4a51d07edf5f0168615ad6179e3a83623 +size 6551348 diff --git a/git.changes b/git.changes index c585c39..73ce709 100644 --- a/git.changes +++ b/git.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Sun Jun 6 15:30:14 UTC 2021 - Andreas Stieger + +- git 2.32.0: + * ".gitattributes", ".gitignore", and ".mailmap" files that are + symbolic links are ignored + * "git apply --3way" used to first attempt a straight + application, and only fell back to the 3-way merge algorithm + when the straight application failed. Starting with this + version, the command will first try the 3-way merge algorithm + and only when it fails (either resulting with conflict or the + base versions of blobs are missing), falls back to the usual + patch application. + * "git stash show" can now show the untracked part of the stash + * Improved "git repack" strategy + * http code can now unlock a certificate with a cached password + respectively. + * "git clone --reject-shallow" option fails the clone as soon as + we notice that we are cloning from a shallow repository. + * "gitweb" learned "e-mail privacy" feature + * Multiple improvements to output and configuration options + * Bug fixes and developer visible fixes + ------------------------------------------------------------------- Thu Apr 22 13:28:06 UTC 2021 - Markéta Machová diff --git a/git.spec b/git.spec index b19433a..2abd547 100644 --- a/git.spec +++ b/git.spec @@ -36,7 +36,7 @@ %bcond_with asciidoctor %endif Name: git -Version: 2.31.1 +Version: 2.32.0 Release: 0 Summary: Fast, scalable, distributed revision control system License: GPL-2.0-only @@ -74,10 +74,6 @@ BuildRequires: perl-Error BuildRequires: perl-MailTools BuildRequires: python3-base BuildRequires: systemd-rpm-macros -%if 0%{?suse_version} >= 1500 -BuildRequires: system-user-nobody -BuildRequires: sysuser-tools -%endif BuildRequires: tcsh BuildRequires: update-desktop-files BuildRequires: xz @@ -91,6 +87,10 @@ Recommends: git-svn Recommends: gitk Suggests: git-daemon Suggests: git-web +%if 0%{?suse_version} >= 1500 +BuildRequires: system-user-nobody +BuildRequires: sysuser-tools +%endif %if %{with docs} BuildRequires: sgml-skel BuildRequires: xmlto @@ -126,12 +126,12 @@ CVS, and GNU arch. Summary: Core git tools Group: Development/Tools/Version Control Requires: less +Obsoletes: git-remote-helpers < %{version} %if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150300 Requires: openssh-clients %else Requires: openssh %endif -Obsoletes: git-remote-helpers < %{version} %description core Git is a fast, scalable, distributed revision control system with an @@ -143,8 +143,8 @@ These are the core tools with minimal dependencies. %package -n perl-Git Summary: perl Bindings for Git Group: Development/Libraries/Perl -Provides: git-core:%{perl_vendorlib}/Git Requires: perl-Error +Provides: git-core:%{perl_vendorlib}/Git %{perl_requires} %description -n perl-Git @@ -246,6 +246,8 @@ Email interface for the GIT version control system. %package daemon Summary: Simple Server for Git Repositories Group: Development/Tools/Version Control +Requires: git-core = %{version} +Requires(pre): %fillup_prereq %if 0%{?suse_version} >= 1550 Requires(pre): group(nobody) %sysusers_requires @@ -254,8 +256,6 @@ Requires(pre): group(nobody) Requires(pre): %{_sbindir}/useradd Requires(pre): shadow %endif -Requires: git-core = %{version} -Requires(pre): %fillup_prereq %description daemon A really simple TCP git daemon. In the default configuration it allows @@ -267,7 +267,7 @@ Summary: Git revision tree visualiser Group: Development/Tools/Version Control Requires: git-core = %{version} Requires: tk >= 8.4 -Supplements: packageand(git-core:tk) +Supplements: (git-core and tk) %description -n gitk Grapical tool for visualization of revision trees of projects @@ -282,7 +282,7 @@ Summary: Grapical tool for common git operations Group: Development/Tools/Version Control Requires: git-core = %{version} Requires: tk >= 8.4 -Supplements: packageand(git-core:tk) +Supplements: (git-core and tk) %description gui A Tcl/Tk based graphical user interface to Git. git-gui focuses on @@ -300,7 +300,7 @@ Group: Development/Tools/Version Control Requires: git-core = %{version} Requires: perl-CGI Requires: perl-Git = %{version} -Supplements: packageand(git-core:apache2) +Supplements: (git-core and apache2) %description web CGI script that allows browsing git repositories via web interface. @@ -548,8 +548,8 @@ fi %{_sysconfdir}/apparmor.d %{gitexecdir}//git-instaweb %{gitexecdir}//git-web--browse -%{_mandir}/man1/*web*1* -%{_mandir}/man5/*web*5* +%{_mandir}/man1/*web*1%{?ext_man} +%{_mandir}/man5/*web*5%{?ext_man} %files core -f bin-man-doc-files %license COPYING