From 40b44f846a8cacfca4ffae1e31211347b518e0f1 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@openpkg.org>
Date: Sun, 15 Oct 2006 11:17:03 +0000
Subject: [PATCH] add httrack.conf taken over from Michael Schloh's patch set
 and fix building against zlib

---
 httrack/httrack.spec | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/httrack/httrack.spec b/httrack/httrack.spec
index 6c2c9a232a..a9a1669dc3 100644
--- a/httrack/httrack.spec
+++ b/httrack/httrack.spec
@@ -22,8 +22,6 @@
 ##  SUCH DAMAGE.
 ##
 
-#   FIXME: rse: there is an etc/httrack/ directory but no default configuration files!?
-
 #   package versions
 %define       V_major    3.40
 %define       V_minor    3
@@ -40,10 +38,11 @@ Class:        EVAL
 Group:        Web
 License:      GPL
 Version:      %{V_major}.%{V_minor}
-Release:      20061013
+Release:      20061015
 
 #   list of sources
 Source0:      http://www.httrack.com/httrack-%{V_major}-%{V_revision}.tar.gz
+Source1:      httrack.conf
 Patch0:       httrack.patch
 
 #   build information
@@ -51,15 +50,17 @@ Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20040130
 PreReq:       OpenPKG, openpkg >= 20040130
+BuildPreReq:  zlib
+PreReq:       zlib
 AutoReq:      no
 AutoReqProv:  no
 
 %description
-    HTTrack is a free and easy-to-use offline browser utility. It allows
+    HTTrack is a free and easy to use offline browser utility. It allows
     you to download a World Wide Web site from the Internet to a local
     directory, building recursively all directories, getting HTML,
     images, and other files from the server to your computer. HTTrack
-    arranges the original site's relative link-structure. Simply open a
+    arranges the original site's relative link structure. Simply open a
     page of the "mirrored" website in your browser, and you can browse
     the site from link to link, as if you were viewing it online.
     HTTrack can also update an existing mirrored site, and resume
@@ -80,7 +81,8 @@ AutoReqProv:  no
 %build
     CC="%{l_cc}" \
     CFLAGS="%{l_cflags -O}" \
-    CPPFLAGS='-DHTS_ETCPATH=\"%{l_prefix}/etc/httrack\"' \
+    CPPFLAGS='%{l_cppflags} -DHTS_ETCPATH=\"%{l_prefix}/etc/httrack\"' \
+    LDFLAGS="%{l_ldflags}" \
     ./configure \
         --prefix=%{l_prefix} \
         --sysconfdir=%{l_prefix}/etc/httrack \
@@ -92,7 +94,11 @@ AutoReqProv:  no
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/etc/httrack
     %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
-    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
+    %{l_shtool} install -c -m 644 \
+        %{SOURCE httrack.conf} $RPM_BUILD_ROOT%{l_prefix}/etc/httrack/
+    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+        %{l_files_std} \
+        '%config %{l_prefix}/etc/httrack/*'
 
 %files -f files