#2 Cleanup spec file conditionals
Closed 6 years ago by merlinm. Opened 6 years ago by merlinm.
Unknown source f27_fix_spec_ifs  into  f27

file modified
+7 -4
@@ -6,7 +6,7 @@

  # ctdb is enabled by default, you can disable it with: --without clustering

  %bcond_without clustering

  

- %define main_release 0

+ %define main_release 1

  

  %define samba_version 4.7.1

  %define talloc_version 2.1.10
@@ -32,14 +32,14 @@

  %global with_profiling 1

  

  %global with_vfs_cephfs 0

- %if 0%{?fedora}

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

%if 0%{?rhel} && 0%{?rhel} <= 7

  %ifarch aarch64 ppc64le s390x x86_64

  %global with_vfs_cephfs 1

  %endif

  %endif

  

  %global with_vfs_glusterfs 1

- %if 0%{?rhel}

+ %if 0%{?rhel} && 0%{?rhel} <= 7

  %global with_vfs_glusterfs 0

  # Only enable on x86_64

  %ifarch x86_64
@@ -56,7 +56,7 @@

  %global with_mitkrb5 1

  %global with_dc 1

  

- %if 0%{?rhel}

+ %if 0%{?rhel} && 0%{?rhel} <= 7

  %global with_dc 0

  %endif

  
@@ -3375,6 +3375,9 @@

  %endif # with_clustering_support

  

  %changelog

+ * Fri Nov 10 2017 Merlin Mathesius <mmathesi@redhat.com> - 4.7.1-1

+ - Cleanup spec file conditionals

+ 

  * Thu Nov 02 2017 Guenther Deschner <gdeschner@redhat.com> - 4.7.1-0

  - resolves: #1508871 - Update to Samba 4.7.1

  

%if 0%{?rhel} && 0%{?rhel} <= 7

same for the rest. please make conditionals forward-looking.

Also doing this just for F27 makes absolutely no sense, we need first to get that in master

I totally disagree with what you say about the conditionals. He has them correct.
But I do agree that this needs to be on master. f27 is nice, but it needs to be on master too.

Pull-Request has been closed by merlinm

6 years ago
Metadata