Skip to content
Snippets Groups Projects
Commit 28990cea authored by Rocky Automation's avatar Rocky Automation :tv:
Browse files

import git-2.45.2-2.el10

parent f27042cb
No related branches found
Tags imports/r10s/git-2.45.2-2.el10
No related merge requests found
c210dc425a2430f8cc1bd1b3a1701e3feb25bb3aba7d8a49c770b1646217bae0 SOURCES/git-2.43.1.tar.sign
2234f37b453ff8e4672c21ad40d41cc7393c9a8dcdfe640bec7ac5b5358f30d2 SOURCES/git-2.43.1.tar.xz
2e891012cf5399457d0f40c35a3b8b50b4ceffcd81540244f76552bae27ae604 SOURCES/git-2.45.2.tar.sign
51bfe87eb1c02fed1484051875365eeab229831d30d0cec5d89a14f9e40e9adb SOURCES/git-2.45.2.tar.xz
c14031c313ee9f73cb551f0e15d66d70980b0238a7409e853d1f684758bd9a1d SOURCES/gpgkey-junio.asc
......@@ -21,8 +21,9 @@
%bcond_without perl_modcompat
%endif
# Settings for Fedora and EL >= 9
%if 0%{?fedora} || 0%{?rhel} >= 9
# Settings for Fedora and EL == 9
# In EL >= 10 docbook5-style-xsl, needed by asciidoctor, is unwanted package
%if 0%{?fedora} || 0%{?rhel} == 9
%bcond_without asciidoctor
%else
%bcond_with asciidoctor
......@@ -58,11 +59,11 @@
%bcond_without libsecret
# Allow p4 subpackage to be toggled via --with/--without
# Disable by default if we lack python2 or python3 support
%if %{with python2} || %{with python3}
%bcond_without p4
%else
# Disable p4 package by default on EL >= 10
%if 0%{?rhel} >= 10
%bcond_with p4
%else
%bcond_without p4
%endif
# Hardening flags for EL-7
......@@ -77,7 +78,7 @@
%global _package_note_file %{_builddir}/%{name}-%{real_version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld
Name: git
Version: 2.43.1
Version: 2.45.2
Release: 2%{?dist}
Summary: Fast Version Control System
License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT
......@@ -163,6 +164,7 @@ BuildRequires: findutils
BuildRequires: gawk
BuildRequires: gcc
BuildRequires: gettext
BuildRequires: glibc-utils
BuildRequires: gnupg2
BuildRequires: libcurl-devel
BuildRequires: make
......@@ -639,13 +641,6 @@ rm -rf contrib/fast-import/import-zips.py
%endif
# endif with python2
# Use python3 to avoid an unnecessary python2 dependency, if possible.
%if %{with python3}
sed -i -e '1s@#!\( */usr/bin/env python\|%{__python2}\)$@#!%{__python3}@' \
contrib/hg-to-git/hg-to-git.py
%endif
# endif with python3
%install
%make_install %{?with_docs:install-doc}
......@@ -1045,6 +1040,13 @@ rmdir --ignore-fail-on-non-empty "$testdir"
%{?with_docs:%{_pkgdocdir}/git-svn.html}
%changelog
* Mon Jul 01 2024 Ondřej Pohořelský <opohorel@redhat.com> - 2.45.2-1
- update to 2.45.2
- add glibc-utils BuildRequires
- build docs with asciidoc instead of a asciidoctor
- drop git-p4 subpackage
- Resolves: RHEL-45572, RHEL-45215
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.43.1-2
- Bump release for June 2024 mass rebuild
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment