rpms/httrack/devel httrack-3.43.9-openssl.patch, 1.1, 1.2 httrack.spec, 1.15, 1.16

[Tomáš Mráz]

Author: tmraz

Update of /cvs/pkgs/rpms/httrack/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22616

Modified Files:
	httrack-3.43.9-openssl.patch httrack.spec 
Log Message:
* Mon Jun  7 2010 Tomas Mraz <tmraz at redhat.com> - 3.43.9-2
- Use libssl soname for openssl dlopen and dependency


httrack-3.43.9-openssl.patch:
 htsmodules.c |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

Index: httrack-3.43.9-openssl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/httrack/devel/httrack-3.43.9-openssl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- httrack-3.43.9-openssl.patch	22 Mar 2010 14:03:40 -0000	1.1
+++ httrack-3.43.9-openssl.patch	7 Jun 2010 07:22:38 -0000	1.2
@@ -6,7 +6,7 @@ diff -urNp httrack-3.43.9.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.1.0.0", RTLD_LAZY);
++      handle = dlopen("libssl.so.10", RTLD_LAZY); /* use soname to load libssl (Tomas Mraz) */
 +      if (handle == NULL) {
 +		handle = dlopen("libssl.so.0.9.8k", RTLD_LAZY);
 +	  }


Index: httrack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/httrack/devel/httrack.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- httrack.spec	22 Mar 2010 14:03:40 -0000	1.15
+++ httrack.spec	7 Jun 2010 07:22:38 -0000	1.16
@@ -1,11 +1,3 @@
-%if 0%{?fc9}%{?fc10}
-  %define _openssl_version 0.9.8g
-%elif 0%{?fc11}
-  %define _openssl_version 0.9.8k
-%else
-  %define _openssl_version 1.0.0
-%endif
-
 %if 0%{?fc7}
 %else
   %define _remove_encoding --remove-key Encoding
@@ -14,7 +6,7 @@
 Summary:	Website copier and offline browser
 Name:		httrack
 Version:	3.43.9
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://www.httrack.com/
@@ -26,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.10%{?reqsuffix}
 Requires:	xdg-utils
 
 BuildRequires:	desktop-file-utils
@@ -166,6 +162,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/%{name}/*
 
 %changelog
+* Mon Jun  7 2010 Tomas Mraz <tmraz at redhat.com> - 3.43.9-2
+- Use libssl soname for openssl dlopen and dependency
+
 * Mon Mar 22 2010 Debarshi Ray <rishi at fedoraproject.org> - 3.43.9-1
 - Version bump to 3.42.93. (Red Hat Bugzilla #512420)
   * Fixed: application/xhtml+xml not seen as "html"