rpms/git
6
0
Fork 0
Code Issues Pull Requests Releases Activity

consolidate macros for Fedora/EPEL

Browse Source 
Fedora 29 has reached its end of life.  Consolidate the macros which
applied to f29 or newer.
This commit is contained in:
Todd Zullinger 2020-02-19 14:42:24 -05:00
parent 9d91bab9c8
commit bed4f32f5e
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
git.spec
View File

@ -14,28 +14,18 @@
%bcond_with linkcheck %bcond_with linkcheck
%endif %endif
# Settings for Fedora > 29 and EL > 7
%if 0%{?fedora} > 29 || 0%{?rhel} > 7
%bcond_with python2
%else
%bcond_without python2
%endif
# Settings for Fedora >= 29 and EL > 7
%if 0%{?fedora} >= 29 || 0%{?rhel} > 7
%global gitweb_httpd_conf gitweb.conf
%else
%global gitweb_httpd_conf git.conf
%endif
# Settings for Fedora and EL > 7 # Settings for Fedora and EL > 7
%if 0%{?fedora} || 0%{?rhel} > 7 %if 0%{?fedora} || 0%{?rhel} > 7
%bcond_with python2
%bcond_without python3 %bcond_without python3
%global gitweb_httpd_conf gitweb.conf
%global use_glibc_langpacks 1 %global use_glibc_langpacks 1
%global use_perl_generators 1 %global use_perl_generators 1
%global use_perl_interpreter 1 %global use_perl_interpreter 1
%else %else
%bcond_without python2
%bcond_with python3 %bcond_with python3
%global gitweb_httpd_conf git.conf
%global use_glibc_langpacks 0 %global use_glibc_langpacks 0
%global use_perl_generators 0 %global use_perl_generators 0
%global use_perl_interpreter 0 %global use_perl_interpreter 0
@ -1046,6 +1036,7 @@ rmdir --ignore-fail-on-non-empty "$testdir"
%changelog %changelog
* Wed Feb 19 2020 Todd Zullinger <tmz@pobox.com> - 2.25.1-2 * Wed Feb 19 2020 Todd Zullinger <tmz@pobox.com> - 2.25.1-2
- split libsecret credential helper into a subpackage (#1804741) - split libsecret credential helper into a subpackage (#1804741)
- consolidate macros for Fedora/EPEL
* Mon Feb 17 2020 Todd Zullinger <tmz@pobox.com> - 2.25.1-1 * Mon Feb 17 2020 Todd Zullinger <tmz@pobox.com> - 2.25.1-1
- update to 2.25.1 - update to 2.25.1