rpms/httrack/F-11 httrack-3.43.2-openssl.patch, 1.1, 1.2 httrack.spec, 1.12, 1.13

[Tomáš Mráz]

Author: tmraz

Update of /cvs/pkgs/rpms/httrack/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9555

Modified Files:
	httrack-3.43.2-openssl.patch httrack.spec 
Log Message:
* Fri Apr  9 2010 Tomas Mraz <tmraz at redhat.com> - 3.43.2-4
- Use library soname for openssl dlopen and dependency


httrack-3.43.2-openssl.patch:
 htsmodules.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Index: httrack-3.43.2-openssl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/httrack/F-11/httrack-3.43.2-openssl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- httrack-3.43.2-openssl.patch	21 Jan 2009 05:15:27 -0000	1.1
+++ httrack-3.43.2-openssl.patch	9 Apr 2010 10:12:44 -0000	1.2
@@ -6,7 +6,7 @@ diff -urNp httrack-3.43.2.orig/src/htsmo
  #else
        /* We are compatible with 0.9.6/7/8/8b and potentially above */
 -      handle = dlopen("libssl.so.0.9.8g", RTLD_LAZY);  /* added 8g release too (Debarshi Ray) */
-+      handle = dlopen("libssl.so.0.9.8j", RTLD_LAZY);  /* added 8j release too (Debarshi Ray) */
++      handle = dlopen("libssl.so.8", RTLD_LAZY);  /* use soname as the first attempt (Tomas Mraz) */
 +      if (handle == NULL) {
 +		handle = dlopen("libssl.so.0.9.8g", RTLD_LAZY);
 +	  }


Index: httrack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/httrack/F-11/httrack.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- httrack.spec	31 Mar 2009 14:53:48 -0000	1.12
+++ httrack.spec	9 Apr 2010 10:12:44 -0000	1.13
@@ -1,9 +1,3 @@
-%if 0%{?fc9}%{?fc10}
-  %define _openssl_version 0.9.8g
-%else
-  %define _openssl_version 0.9.8k
-%endif
-
 %if 0%{?fc7}
 %else
   %define _remove_encoding --remove-key Encoding
@@ -12,7 +6,7 @@
 Summary:	Website copier and offline browser
 Name:		httrack
 Version:	3.43.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://www.httrack.com/
@@ -24,7 +18,11 @@ Patch2:		%{name}-%{version}-openssl.patc
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-Requires:	openssl = %{_openssl_version}
+# Add explicit dependency on openssl library with soname we dlopen
+%if %{__isa_bits} == 64
+  %define reqsuffix ()(64bit)
+%endif
+Requires:	libssl.so.8%{?reqsuffix}
 Requires:	xdg-utils
 
 BuildRequires:	desktop-file-utils
@@ -164,6 +162,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/%{name}/*
 
 %changelog
+* Fri Apr  9 2010 Tomas Mraz <tmraz at redhat.com> - 3.43.2-4
+- Use library soname for openssl dlopen and dependency
+
 * Tue Mar 31 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 3.43.2-3
 - Updated 'Requires: openssl = 0.9.8k'