changeset 925:e8b6f74bfc39

Merge
author Simon Horman <horms@verge.net.au>
date Thu, 11 Sep 2014 11:24:59 +0900
parents 705ca7a35fc5 (current diff) 9686672df5a3 (diff)
children cd93d9a693ae
files perdition.spec.in
diffstat 1 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/perdition.spec.in	Sun Jan 26 21:48:16 2014 +0900
+++ b/perdition.spec.in	Thu Sep 11 11:24:59 2014 +0900
@@ -39,7 +39,7 @@
 %{!?_without_ssl:BuildRequires: openssl-devel}
 %{!?_without_odbc:BuildRequires: unixODBC-devel}
 
-%if 0%{?suse_version} || 0%{?fedora_version}
+%if 0%{?centos_version} >= 600 || 0%{?rhel_version} >= 600 || 0%{?suse_version} || 0%{?fedora_version}
 BuildRequires: popt-devel
 %else
 %if 0%{?mandriva_version}
@@ -80,8 +80,6 @@
 %endif
 %endif
 
-Requires: libvanessa_socket2 >= 0.0.12
-
 %description
 Perdition is a fully featured POP3 and IMAP4 proxy server. It is able to
 handle both SSL and non-SSL connections and redirect users to a