rpms/httrack/devel httrack-3.42-openssl.patch, 1.2, 1.3 httrack.spec, 1.4, 1.5

[Debarshi Ray (rishi)]

Author: rishi

Update of /cvs/pkgs/rpms/httrack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15554

Modified Files:
	httrack-3.42-openssl.patch httrack.spec 
Log Message:
Updated to 3.42-8 in devel.
 
 Modified Files:
 	.cvsignore Makefile htsglobal.h httrack-3.42-desktop.patch 
 	httrack-3.42-generic-macros.patch 
 	httrack-3.42-libhtsjava.patch httrack-3.42-openssl.patch 
 	httrack-3.42-utf-8.patch httrack-3.42-xdg-utils.patch 
 	httrack.spec sources 


httrack-3.42-openssl.patch:

Index: httrack-3.42-openssl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/httrack/devel/httrack-3.42-openssl.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- httrack-3.42-openssl.patch	9 Dec 2007 18:33:14 -0000	1.2
+++ httrack-3.42-openssl.patch	12 Dec 2007 21:37:46 -0000	1.3
@@ -1,12 +1,15 @@
 diff -urNp httrack-3.42.1.orig/src/htsmodules.c httrack-3.42.1/src/htsmodules.c
 --- httrack-3.42.1.orig/src/htsmodules.c	2007-02-03 19:05:56.000000000 +0530
-+++ httrack-3.42.1/src/htsmodules.c	2007-11-18 18:43:46.000000000 +0530
-@@ -263,7 +263,7 @@ void htspe_init(void) {
++++ httrack-3.42.1/src/htsmodules.c	2007-12-13 02:18:45.000000000 +0530
+@@ -263,7 +263,10 @@ void htspe_init(void) {
        handle = LoadLibraryA((char*)"ssleay32");
  #else
        /* We are compatible with 0.9.6/7/8 and potentially above */
 -      handle = dlopen("libssl.so.0.9.8", RTLD_LAZY);
 +      handle = dlopen("libssl.so.0.9.8g", RTLD_LAZY);
++      if (handle == NULL) {
++        handle = dlopen("libssl.so.0.9.8b", RTLD_LAZY);
++      }
        if (handle == NULL) {
          handle = dlopen("libssl.so.0.9.7", RTLD_LAZY);
        }


Index: httrack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/httrack/devel/httrack.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- httrack.spec	9 Dec 2007 18:33:14 -0000	1.4
+++ httrack.spec	12 Dec 2007 21:37:46 -0000	1.5
@@ -1,3 +1,9 @@
+%if 0%{?fc7}%{?fc8}
+  %define _openssl_version 0.9.8b
+%else
+  %define _openssl_version 0.9.8g
+%endif
+
 %if 0%{?fc7}
 %else
   %define _remove_encoding --remove-key Encoding
@@ -6,7 +12,7 @@
 Summary:	Website copier and offline browser
 Name:		httrack
 Version:	3.42
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://www.httrack.com/
@@ -22,9 +28,10 @@
 
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-Requires:	openssl = 0.9.8g
+Requires:	openssl = %{_openssl_version}
 Requires:	xdg-utils
 
+BuildRequires:	chrpath
 BuildRequires:	desktop-file-utils
 BuildRequires:	dos2unix
 BuildRequires:	zlib-devel
@@ -134,6 +141,11 @@
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   $RPM_BUILD_ROOT%{_datadir}/applications/WebHTTrack-Websites.desktop
 
+# Remove rpaths.
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/htsserver
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/%{name}
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libhtsjava.so.2.0.42
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -177,8 +189,11 @@
 %{_includedir}/%{name}/*
 
 %changelog
+* Thu Dec 13 2007 Debarshi Ray <rishi at fedoraproject.org> - 3.42-8
+- Added 'BuildRequires: chrpath' for removing rpaths.
+
 * Sun Dec 09 2007 Debarshi Ray <rishi at fedoraproject.org> - 3.42-7
-- Updated 'Requires: openssl = 0.9.8g' and fixed the sources.
+- Updated 'Requires: openssl = 0.9.8g' and fixed the sources for Rawhide.
 
 * Fri Dec 07 2007 Release Engineering <rel-eng at fedoraproject.org> - 3.42-6
 - Rebuild for deps.