rpms/mingw32-openssl/devel mingw32-openssl.spec, 1.15, 1.16 mingw32-openssl-1.0.0-beta3-configure.patch, 1.1, NONE

[Kalev Lember]

Author: kalev

Update of /cvs/pkgs/rpms/mingw32-openssl/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25778

Modified Files:
	mingw32-openssl.spec 
Removed Files:
	mingw32-openssl-1.0.0-beta3-configure.patch 
Log Message:
Use sed to fix up cflags instead of unmaintainable patch



Index: mingw32-openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-openssl/devel/mingw32-openssl.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- mingw32-openssl.spec	19 Jun 2010 19:33:40 -0000	1.15
+++ mingw32-openssl.spec	19 Jun 2010 19:46:13 -0000	1.16
@@ -81,8 +81,6 @@ Patch53:        openssl-1.0.0-name-hash.
 # Backported fixes including security fixes
 
 # MinGW-specific patches.
-# Use MINGW32_CFLAGS (set below) in Configure script
-Patch100:       mingw32-openssl-1.0.0-beta3-configure.patch
 # Rename *eay32.dll to lib*.dll
 Patch101:       mingw32-openssl-1.0.0-beta3-libversion.patch
 # Fix engines/ install target after lib rename
@@ -181,11 +179,13 @@ Static version of the MinGW port of the 
 %patch52 -p1 -b .aesni
 %patch53 -p1 -b .name-hash
 
-%patch100 -p1 -b .mingw-configure
 %patch101 -p1 -b .mingw-libversion
 %patch102 -p1 -b .mingw-sfx
 %patch105 -p0 -b .mingw-linker-fix
 
+# Use _mingw32_cflags instead of hardcoded ones
+sed -i -e '/^"mingw"/ s/-fomit-frame-pointer -O3 -march=i486 -Wall/%{_mingw32_cflags}/' Configure
+
 # Modify the various perl scripts to reference perl in the right location.
 perl util/perlpath.pl `dirname %{__perl}`
 
@@ -196,7 +196,6 @@ make TABLE PERL=%{__perl}
 %build
 # NB: 'no-hw' is vital.  MinGW cannot build the hardware drivers
 # and if you don't have this you'll get an obscure link error.
-export MINGW32_CFLAGS="%{_mingw32_cflags}"; \
 ./Configure \
   --prefix=%{_mingw32_prefix} \
   --openssldir=%{_mingw32_sysconfdir}/pki/tls \
@@ -346,6 +345,7 @@ rm -rf $RPM_BUILD_ROOT
 * Sat Jun 19 2010 Kalev Lember <kalev at smartlink.ee> - 1.0.0a-1
 - Updated to openssl 1.0.0a
 - Synced patches with Fedora native openssl-1.0.0a-1
+- Use sed to fix up cflags instead of unmaintainable patch
 
 * Thu Nov 26 2009 Kalev Lember <kalev at smartlink.ee> - 1.0.0-0.6.beta4
 - Merged patches from native Fedora openssl (up to 1.0.0-0.16.beta4)


--- mingw32-openssl-1.0.0-beta3-configure.patch DELETED ---