rpms/mingw32-openssl/devel mingw32-openssl-1.0.0-beta3-libversion.patch, 1.2, 1.3 mingw32-openssl.spec, 1.10, 1.11

[Kalev Lember]

Author: kalev

Update of /cvs/pkgs/rpms/mingw32-openssl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21502

Modified Files:
	mingw32-openssl-1.0.0-beta3-libversion.patch 
	mingw32-openssl.spec 
Log Message:
Simplified the lib renaming patch


mingw32-openssl-1.0.0-beta3-libversion.patch:
 Makefile.org    |    4 ++--
 Makefile.shared |   12 +++---------
 2 files changed, 5 insertions(+), 11 deletions(-)

Index: mingw32-openssl-1.0.0-beta3-libversion.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-openssl/devel/mingw32-openssl-1.0.0-beta3-libversion.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mingw32-openssl-1.0.0-beta3-libversion.patch	29 Aug 2009 23:13:34 -0000	1.2
+++ mingw32-openssl-1.0.0-beta3-libversion.patch	30 Aug 2009 00:53:20 -0000	1.3
@@ -24,20 +24,16 @@ diff -up openssl-1.0.0-beta3/Makefile.sh
  
  # LIBCOMPATVERSIONS contains the compatibility versions (a list) of
  # the library.  They MUST be in decreasing order.
-@@ -250,9 +250,9 @@ link_o.cygwin:
+@@ -250,7 +250,7 @@ link_o.cygwin:
  	base=-Wl,--enable-auto-image-base; \
  	deffile=; \
  	if expr $(PLATFORM) : 'mingw' > /dev/null; then \
 -		SHLIB=$(LIBNAME)eay32; base=; \
--		if test -f $(LIBNAME)eay32.def; then \
--			deffile=$(LIBNAME)eay32.def; \
 +		SHLIB=lib$(LIBNAME); base=; \
-+		if test -f $(LIBNAME).def; then \
-+			deffile=$(LIBNAME).def; \
+ 		if test -f $(LIBNAME)eay32.def; then \
+ 			deffile=$(LIBNAME)eay32.def; \
  		fi; \
- 	fi; \
- 	SHLIB_SUFFIX=.dll; \
-@@ -270,13 +270,9 @@ link_a.cygwin:
+@@ -270,13 +270,7 @@ link_a.cygwin:
  	dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; extras=; \
  	base=-Wl,--enable-auto-image-base; \
  	if expr $(PLATFORM) : 'mingw' > /dev/null; then \
@@ -46,21 +42,9 @@ diff -up openssl-1.0.0-beta3/Makefile.sh
 -			ssl) SHLIB=ssleay;; \
 -		esac; \
 -		SHLIB_SOVER=32; \
-+		SHLIB=lib$(LIBNAME); \
- 		extras="$(LIBNAME).def"; \
+-		extras="$(LIBNAME).def"; \
 -		$(PERL) util/mkdef.pl 32 $$SHLIB > $$extras; \
-+		$(PERL) util/mkdef.pl 32 $(LIBNAME) > $$extras; \
++		SHLIB=lib$(LIBNAME); \
  		base=; [ $(LIBNAME) = "crypto" ] && base=-Wl,--image-base,0x63000000; \
  	fi; \
  	dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \
---- openssl-1.0.0-beta3/util/mkdef.pl.orig	2009-08-30 00:50:32.108820466 +0200
-+++ openssl-1.0.0-beta3/util/mkdef.pl	2009-08-30 00:51:00.032820656 +0200
-@@ -1244,7 +1244,7 @@
- 	my $description = "$what $version, $name - http://$http_vendor";
- 
- 	if ($W32)
--		{ $libname.="32"; }
-+		{ $libname="lib$libname-10.dll"; }
- 	elsif ($W16)
- 		{ $libname.="16"; }
- 	elsif ($OS2)


Index: mingw32-openssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-openssl/devel/mingw32-openssl.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mingw32-openssl.spec	29 Aug 2009 23:13:34 -0000	1.10
+++ mingw32-openssl.spec	30 Aug 2009 00:53:20 -0000	1.11
@@ -31,7 +31,7 @@
 
 Name:           mingw32-openssl
 Version:        1.0.0
-Release:        0.2.%{beta}%{?dist}
+Release:        0.3.%{beta}%{?dist}
 Summary:        MinGW port of the OpenSSL toolkit
 
 License:        OpenSSL
@@ -347,6 +347,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 30 2009 Kalev Lember <kalev at smartlink.ee> - 1.0.0-0.3.beta3
+- Simplified the lib renaming patch
+
 * Sun Aug 30 2009 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.0.0-0.2.beta3
 - Fixed invalid RPM Provides