From c1a894440effea5acf2c244b776143d61d313de1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 14 Jan 2014 10:01:39 +0100 Subject: [PATCH 1/2] EPEL-7 build (RHEL-7 don't have libc-client) --- uw-imap.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/uw-imap.spec b/uw-imap.spec index 3b8b91b..1207b07 100644 --- a/uw-imap.spec +++ b/uw-imap.spec @@ -1,7 +1,7 @@ # Fedora review: http://bugzilla.redhat.com/166008 -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} == 7 %define _with_devel 1 # ship static lib, matches default upstream config # as convenience to users, since our hacked shlib can potentially break @@ -9,14 +9,14 @@ %define _with_static 1 %endif -%if 0%{?rhel} > 5 +%if 0%{?rhel} == 6 %define _with_system_libc_client 1 %endif Summary: UW Server daemons for IMAP and POP network mail protocols Name: uw-imap Version: 2007f -Release: 4%{?dist} +Release: 4%{?dist}.1 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0 License: ASL 2.0 @@ -348,6 +348,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jan 14 2014 Remi Collet - 2007f-4.1 +- EPEL-7 build (RHEL-7 don't have libc-client) + * Fri Feb 15 2013 Fedora Release Engineering - 2007f-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From b45ddf11832a2a3ad227f3ffe512d03aa9eaa2ff Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 11 Jul 2017 10:01:32 -0500 Subject: [PATCH 2/2] Revert "EPEL-7 build (RHEL-7 don't have libc-client)" This reverts commit c1a894440effea5acf2c244b776143d61d313de1. --- uw-imap.spec | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/uw-imap.spec b/uw-imap.spec index 1207b07..3b8b91b 100644 --- a/uw-imap.spec +++ b/uw-imap.spec @@ -1,7 +1,7 @@ # Fedora review: http://bugzilla.redhat.com/166008 -%if 0%{?fedora} || 0%{?rhel} == 7 +%if 0%{?fedora} %define _with_devel 1 # ship static lib, matches default upstream config # as convenience to users, since our hacked shlib can potentially break @@ -9,14 +9,14 @@ %define _with_static 1 %endif -%if 0%{?rhel} == 6 +%if 0%{?rhel} > 5 %define _with_system_libc_client 1 %endif Summary: UW Server daemons for IMAP and POP network mail protocols Name: uw-imap Version: 2007f -Release: 4%{?dist}.1 +Release: 4%{?dist} # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0 License: ASL 2.0 @@ -348,9 +348,6 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Tue Jan 14 2014 Remi Collet - 2007f-4.1 -- EPEL-7 build (RHEL-7 don't have libc-client) - * Fri Feb 15 2013 Fedora Release Engineering - 2007f-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild