fix gcc -E not dumping output with .s ext, works with .S

[packages/openssl.git] / openssl.spec

diff --git a/openssl.spec b/openssl.spec
index e58f7142825d00a8c747bc3321a1fc6a366c749a..bd1f694fd968be6f411070fa8eff518efff5ed02 100644 (file)
--- a/openssl.spec
+++ b/openssl.spec
@@ -37,11 +37,11 @@ Patch5:             %{name}-asflag.patch
 Patch6:                %{name}-ca-certificates.patch
 Patch7:                %{name}-ldflags.patch
 Patch8:                %{name}-find.patch
-# from debian
+Patch9:                gcc-E-asm.patch
 Patch10:       default_bits.patch
 Patch11:       pic.patch
 Patch12:       stddef.patch
-Patch13:       openssl_fix_for_x32.patch
+Patch13:       %{name}_fix_for_x32.patch
 URL:           http://www.openssl.org/
 BuildRequires: bc
 BuildRequires: perl-devel >= 1:5.6.1
@@ -54,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
@@ -257,6 +259,7 @@ RC4, RSA и SSL. Включает статические библиотеки д
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1