#3783 SPEC: Drop unnecessary check for minor version of el7
Merged 5 years ago by jhrozek. Opened 5 years ago by lslebodn.
SSSD/ lslebodn/sssd spec_el7  into  master

file modified
+2 -2
@@ -112,7 +112,7 @@ 

      %global enable_systemtap_opt --enable-systemtap

  %endif

  

- %if (0%{?fedora} || (0%{?rhel} >= 7 && 0%{rhel7_minor} >= 4))

+ %if (0%{?fedora} || 0%{?rhel} >= 7)

      %global with_secrets 1

  %else

      %global with_secret_responder --without-secrets
@@ -125,7 +125,7 @@ 

      %global with_kcm_option --without-kcm

  %endif

  

- %if (0%{?fedora} >= 27 || (0%{?rhel} >= 7 && 0%{?rhel7_minor} > 4))

+ %if (0%{?fedora} >= 27 || 0%{?rhel} >= 7)

      %global with_gdm_pam_extensions 1

  %else

      %global with_gdm_pam_extensions 0

CentOS 7.5.1804 was release more than 2 months ago
https://blog.centos.org/2018/05/centos-7-5-1804-released/

So we can drop checks for minor versions of el7. They were used
to distinguish between released and development versions and to use
new optional features.

rebased onto 6f86268ba7680ab743f8146017ff8d3e58a4eb29

5 years ago

Actually nack, this breaks RHEL-6. CI says:
No package gdm-pam-extensions-devel available.

Actually nack, this breaks RHEL-6. CI says:
No package gdm-pam-extensions-devel available.

Sorry, I accidentally removed to much; just check for minor version should be removed.

It's fixed now

rebased onto 4f16317

5 years ago

Commit 7fbee79 fixes this pull-request

Pull-Request has been merged by jhrozek

5 years ago
Metadata