Merge branch 'rawhide' into f35

git.skip-test-patterns

@@ -4,7 +4,7 @@ GIT_SKIP_TESTS
 missing AUTOIDENT
 missing CASE_INSENSITIVE_FS
 missing DONTHAVEIT
-missing EXPENSIVE
+missing ([!]LONG_IS_64BIT,)?EXPENSIVE
 missing JGIT
 missing !?LAZY_(TRUE|FALSE)
 missing MINGW

git.spec

@@ -39,6 +39,7 @@
 %else
 %bcond_without              python2
 %bcond_with                 python3
+%global build_cflags        %{build_cflags} -fPIC -std=gnu99
 %global gitweb_httpd_conf   git.conf
 %global use_glibc_langpacks 0
 %global use_perl_generators 0
@@ -75,11 +76,14 @@
 %global _hardened_build     1
 %endif
 
+# Set path to the package-notes linker script
+%global _package_note_file  %{_builddir}/%{name}-%{version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld
+
 # Define for release candidates
 #global rcrev   .rc0
 
 Name:           git
-Version:        2.34.1
+Version:        2.35.1
 Release:        1%{?rcrev}%{?dist}
 Summary:        Fast Version Control System
 License:        GPLv2
@@ -218,7 +222,7 @@ BuildRequires:  jgit
 %endif
 # endif fedora (except i386 and s390x)
 BuildRequires:  mod_dav_svn
-BuildRequires:  openssh
+BuildRequires:  openssh-clients
 BuildRequires:  perl(App::Prove)
 BuildRequires:  perl(CGI)
 BuildRequires:  perl(CGI::Carp)
@@ -544,6 +548,9 @@ INSTALL_SYMLINKS = 1
 GITWEB_PROJECTROOT = %{_localstatedir}/lib/git
 GNU_ROFF = 1
 NO_PERL_CPAN_FALLBACKS = 1
+%if 0%{?rhel} && 0%{?rhel} < 8
+NO_UNCOMPRESS2 = 1
+%endif
 %if %{with python3}
 PYTHON_PATH = %{__python3}
 %else
@@ -667,6 +674,9 @@ install -Dpm 0755 contrib/diff-highlight/diff-highlight \
     %{buildroot}%{_datadir}/git-core/contrib/diff-highlight
 rm -rf contrib/diff-highlight/{Makefile,diff-highlight,*.perl,t}
 
+# Remove contrib/scalar to avoid cruft in the git-core-doc docdir
+rm -rf contrib/scalar
+
 # Clean up contrib/subtree to avoid cruft in the git-core-doc docdir
 rm -rf contrib/subtree/{INSTALL,Makefile,git-subtree*,t}
 
@@ -1008,6 +1018,31 @@ rmdir --ignore-fail-on-non-empty "$testdir"
 %{?with_docs:%{_pkgdocdir}/git-svn.html}
 
 %changelog
+* Sat Jan 29 2022 Todd Zullinger <tmz@pobox.com> - 2.35.1-1
+- update to 2.35.1
+
+* Mon Jan 24 2022 Todd Zullinger <tmz@pobox.com> - 2.35.0-1
+- update to 2.35.0
+- set path to linker script in %%_package_note_file
+
+* Sat Jan 22 2022 Todd Zullinger <tmz@pobox.com> - 2.35.0-0.2.rc2.3
+- remove contrib/scalar to avoid cruft in git-core-doc
+
+* Fri Jan 21 2022 Todd Zullinger <tmz@pobox.com> - 2.35.0-0.2.rc2.2
+- fix compilation on EL7
+
+* Thu Jan 20 2022 Todd Zullinger <tmz@pobox.com> - 2.35.0-0.2.rc2.1
+- checkout: avoid BUG() when hitting a broken repository (rhbz#2042920)
+
+* Wed Jan 19 2022 Todd Zullinger <tmz@pobox.com> - 2.35.0-0.2.rc2
+- update to 2.35.0-rc2
+
+* Sat Jan 15 2022 Todd Zullinger <tmz@pobox.com> - 2.35.0-0.1.rc1
+- update to 2.35.0-rc1
+
+* Mon Jan 10 2022 Todd Zullinger <tmz@pobox.com> - 2.35.0-0.0.rc0
+- update to 2.35.0-rc0
+
 * Thu Nov 25 2021 Todd Zullinger <tmz@pobox.com> - 2.34.1-1
 - update to 2.34.1
 - fix gpgsm issues with gnupg-2.3

sources

@@ -1,2 +1,2 @@
-SHA512 (git-2.34.1.tar.xz) = a1a8e9e6f64b1da25508fbd2f783564dcdbe181fb5ff1ebab3bdac6db6094e18acc334479a1abf22ac17ce4f733cc3e10a664db9ab234cd523735a3f027b42db
-SHA512 (git-2.34.1.tar.sign) = a1111276e18da1a7b360e3ed3b8460034ea413b116482b0b66342f8873a9dd02a90f3f5bc7ad1e4b3c7f39ed55926a8155064b849e6e6bdf9478cb85b93f10b5
+SHA512 (git-2.35.1.tar.xz) = 926c6813ef61931e1a1c43dfd7b15e20dc5878c1752876bd08f039249c9ed09f20f096b2f01947de9c9522c942e9fa8c1363d7d31a488bbe3f93c0cff31fcbcb
+SHA512 (git-2.35.1.tar.sign) = 27adbb0628a18ae13ce76c2812c2f2a8a9da002105ca1f550a864ae769a27efa697ab7cbd8582e69be99d8731fe2f53895321c3a71990ffbcfe1e7f2064fd9b7