From a380f9bfa145e4bb3d98dbe519476b64594b6dbe Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Jul 31 2017 13:01:04 +0000
Subject: Merge branch 'master' into epel7


---

diff --git a/uw-imap.spec b/uw-imap.spec
index 6428682..982a33f 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} > 6
 %define _with_devel 1
 # ship static lib, matches default upstream config
 # as convenience to users, since our hacked shlib can potentially break 
@@ -22,7 +22,7 @@
 Summary: UW Server daemons for IMAP and POP network mail protocols
 Name:	 uw-imap 
 Version: 2007f
-Release: 14%{?dist}
+Release: 16%{?dist}
 
 # See LICENSE.txt, http://www.apache.org/licenses/LICENSE-2.0
 License: ASL 2.0 
@@ -72,12 +72,17 @@ Patch12: imap-2007f-format-security.patch
 Patch13: imap-2007e-poll.patch
 
 BuildRequires: krb5-devel
-BuildRequires: openssl-devel
 BuildRequires: pam-devel
 
 Requires: xinetd
 Requires(post): openssl
 
+%if 0%{?fedora} > 25 || 0%{?rhel} > 7
+BuildRequires: compat-openssl10-devel
+%else
+BuildRequires: openssl-devel
+%endif
+
 %if 0%{?_with_system_libc_client}
 BuildRequires: libc-client-devel = %{version}
 Requires: %{imap_libs}%{?_isa} = %{version}
@@ -271,10 +276,6 @@ mkdir -p $RPM_BUILD_ROOT%{ssldir}/certs
 touch $RPM_BUILD_ROOT%{ssldir}/certs/{imapd,ipop3d}.pem
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 # FIXME, do on first launch (or not at all?), not here -- Rex
 %post
 {
@@ -350,9 +351,16 @@ done
 
 
 %changelog
+* Mon Jul 31 2017 Rex Dieter <rdieter@fedoraproject.org> - 2007f-16
+- -devel for el7+ too (#1473520)
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2007f-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Tue Jul 11 2017 Rex Dieter <rdieter@fedoraproject.org> - 2007f-14
-- .spec cosmetics, %%define -> %%global
+- .spec cosmetics, %%define -> %%global, drop %%clean
 - workaround el6 libc-client WONTFIX brokenness (#736120)
+- use compat-openssl10 on f26+ (#1424334)
 
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2007f-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild