rpms/mingw32-openssl/devel mingw32-openssl.spec, 1.18, 1.19 mingw32-openssl-1.0.0a-linker-fix.patch, 1.1, NONE

[Kalev Lember]

Author: kalev

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

Modified Files:
	mingw32-openssl.spec 
Removed Files:
	mingw32-openssl-1.0.0a-linker-fix.patch 
Log Message:
Properly regenerate def files with mkdef.pl and drop linker-fix.patch



Index: mingw32-openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-openssl/devel/mingw32-openssl.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- mingw32-openssl.spec	19 Jun 2010 19:53:35 -0000	1.18
+++ mingw32-openssl.spec	19 Jun 2010 20:08:08 -0000	1.19
@@ -85,9 +85,6 @@ Patch53:        openssl-1.0.0-name-hash.
 Patch101:       mingw32-openssl-1.0.0-beta3-libversion.patch
 # Fix engines/ install target after lib rename
 Patch102:       mingw32-openssl-1.0.0a-sfx.patch
-# Ugly patch to fix a compilation error (the linker can't find
-# some symbols mentioned in an autogenerated .def file)
-Patch103:       mingw32-openssl-1.0.0a-linker-fix.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -181,7 +178,6 @@ Static version of the MinGW port of the 
 
 %patch101 -p1 -b .mingw-libversion
 %patch102 -p1 -b .mingw-sfx
-%patch103 -p1 -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
@@ -207,6 +203,10 @@ make TABLE PERL=%{__perl}
   shared mingw
 #  --with-krb5-flavor=MIT
 #  -I%{_mingw32_prefix}/kerberos/include -L%{_mingw32_prefix}/kerberos/%{_lib}
+
+# Regenerate def files as we disabled some algorithms above
+perl util/mkdef.pl crypto ssl update
+
 make depend
 make all build-shared
 
@@ -349,6 +349,7 @@ rm -rf $RPM_BUILD_ROOT
 - Use sed to fix up cflags instead of unmaintainable patch
 - Rebased mingw32 specific patches
 - Disabled capieng to fix build
+- Properly regenerate def files with mkdef.pl and drop linker-fix.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.0a-linker-fix.patch DELETED ---