3a24c9cc conflicts don't apply for ac

[packages/openssl.git] / openssl.spec

diff --git a/openssl.spec b/openssl.spec
index 9ae870c08c4aa9869344fa13e0fbd1c5dad8911a..39e6135751b7f79afd41962ba5b3aee6274540c2 100644 (file)
--- a/openssl.spec
+++ b/openssl.spec
@@ -3,9 +3,9 @@
 #
 # Conditional build:
 %bcond_without tests   # don't perform "make tests"
-%bcond_with    zlib    # zlib: note - enables CVE-2012-4929 vulnerability
-%bcond_with    sslv2   # SSLv2: note - many flaws http://en.wikipedia.org/wiki/Transport_Layer_Security#SSL_2.0
-%bcond_with    sslv3   # SSLv3: note - enables  CVE-2014-3566 vulnerability
+%bcond_without zlib    # zlib: note - enables CVE-2012-4929 vulnerability
+%bcond_without sslv2   # SSLv2: note - many flaws http://en.wikipedia.org/wiki/Transport_Layer_Security#SSL_2.0
+%bcond_without sslv3   # SSLv3: note - enables  CVE-2014-3566 vulnerability
 %bcond_with    purify  # Compile openssl with \-DPURIFY, useful when one wants to
                        # use valgrind debugger against openssl-linked programs
 
@@ -20,7 +20,7 @@ Summary(ru.UTF-8):    Библиотеки и утилиты для соедине
 Summary(uk.UTF-8):     Бібліотеки та утиліти для з'єднань через Secure Sockets Layer
 Name:          openssl
 Version:       1.0.1j
-Release:       2
+Release:       3
 License:       Apache-like
 Group:         Libraries
 Source0:       ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
@@ -41,6 +41,7 @@ Patch8:               %{name}-find.patch
 Patch10:       default_bits.patch
 Patch11:       pic.patch
 Patch12:       stddef.patch
+Patch13:       openssl_fix_for_x32.patch
 URL:           http://www.openssl.org/
 BuildRequires: bc
 BuildRequires: perl-devel >= 1:5.6.1
@@ -53,9 +54,11 @@ Obsoletes:   SSLeay
 Obsoletes:     SSLeay-devel
 Obsoletes:     SSLeay-perl
 Obsoletes:     libopenssl0
+%if "%{pld_release}" != "ac"
 Conflicts:     neon < 0.29.6-8
 Conflicts:     openssh-clients < 2:6.2p2-3
 Conflicts:     openssh-server < 2:6.2p2-3
+%endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -259,6 +262,7 @@ RC4, RSA и SSL. Включает статические библиотеки д
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 sed -i -e 's|\$prefix/\$libdir/engines|/%{_lib}/engines|g' Configure
 
@@ -303,6 +307,9 @@ PERL="%{__perl}" \
 %ifarch %{x8664}
        linux-x86_64
 %endif
+%ifarch x32
+       linux-x32
+%endif
 %ifarch ia64
        linux-ia64
 %endif