OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 13-Jan-2006 08:49:58
Branch: HEAD Handle: 2006011307495701
Added files:
openpkg-src/httrack httrack.patch
Modified files:
openpkg-src/httrack httrack.spec
Log:
some packaging cleanups (mostly cosmetics)
Summary:
Revision Changes Path
1.1 +47 -0 openpkg-src/httrack/httrack.patch
1.2 +24 -26 openpkg-src/httrack/httrack.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/httrack/httrack.patch
============================================================================
$ cvs diff -u -r0 -r1.1 httrack.patch
--- /dev/null 2006-01-13 08:49:44 +0100
+++ httrack.patch 2006-01-13 08:49:58 +0100
@@ -0,0 +1,47 @@
+Index: configure
+--- configure.orig 2005-06-04 14:17:32 +0200
++++ configure 2006-01-13 08:41:50 +0100
+@@ -8440,9 +8440,7 @@
+
+ ### Default CFLAGS
+ DEFAULT_CFLAGS=""
+-DEFAULT_CFLAGS="-O -g3 -Wall -Wcast-align -Wstrict-prototypes \
+--Wmissing-prototypes -Wmissing-declarations -Wpointer-arith \
+--Wnested-externs -D_REENTRANT"
++DEFAULT_CFLAGS="-D_REENTRANT"
+
+
+
+Index: html/Makefile.in
+--- html/Makefile.in.orig 2005-06-04 14:17:28 +0200
++++ html/Makefile.in 2006-01-13 08:43:55 +0100
+@@ -134,18 +134,18 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+
+-HelpHtmlrootdir = $(datadir)/doc/httrack
+-HelpHtmldir = $(datadir)/doc/httrack/html
+-HelpHtmlimgdir = $(datadir)/doc/httrack/html/img
+-HelpHtmldivdir = $(datadir)/doc/httrack/html/div
+-HelpHtmlimagesdir = $(datadir)/doc/httrack/html/images
+-HelpHtmlTxtdir = $(datadir)/doc/httrack/html
+-WebHtmldir = $(datadir)/doc/httrack/html/server
+-WebHtmlimagesdir = $(datadir)/doc/httrack/html/server/images
+-WebHtmlsfxdir = $(datadir)/doc/httrack/html/server/sfx
+-WebPixmapdir = $(datadir)/pixmaps
++HelpHtmlrootdir = $(datadir)/httrack/doc
++HelpHtmldir = $(datadir)/httrack/doc/html
++HelpHtmlimgdir = $(datadir)/httrack/doc/html/img
++HelpHtmldivdir = $(datadir)/httrack/doc/html/div
++HelpHtmlimagesdir = $(datadir)/httrack/doc/html/images
++HelpHtmlTxtdir = $(datadir)/httrack/doc/html
++WebHtmldir = $(datadir)/httrack/doc/html/server
++WebHtmlimagesdir = $(datadir)/httrack/doc/html/server/images
++WebHtmlsfxdir = $(datadir)/httrack/doc/html/server/sfx
++WebPixmapdir = $(datadir)/httrack/pixmaps
+ WebGPixmapdir = $(datadir)/httrack/icons
+-VFolderEntrydir = $(prefix)/share/applications
++VFolderEntrydir = $(datadir)/httrack/desktop
+
+ HelpHtmlroot_DATA = ../httrack-doc.html ../history.txt
+ HelpHtml_DATA = *.html
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/httrack/httrack.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 httrack.spec
--- openpkg-src/httrack/httrack.spec 11 Jan 2006 20:14:43 -0000 1.1
+++ openpkg-src/httrack/httrack.spec 13 Jan 2006 07:49:58 -0000 1.2
@@ -22,7 +22,8 @@
## SUCH DAMAGE.
##
-%define V_base 3.33
+# package versions
+%define V_major 3.33
%define V_minor 16
# package information
@@ -35,62 +36,59 @@
Class: EVAL
Group: Web
License: GPL
-Version: %{V_base}.%{V_minor}
-Release: 20060111
+Version: %{V_major}.%{V_minor}
+Release: 20060113
# list of sources
-Source0: http://httrack.free.fr/mirror/httrack-%{V_base}.tar.gz
+Source0: http://httrack.free.fr/mirror/httrack-%{V_major}.tar.gz
+Patch0: httrack.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 2.5.0
-PreReq: OpenPKG, openpkg >= 2.5.0
+BuildPreReq: OpenPKG, openpkg >= 20040130
+PreReq: OpenPKG, openpkg >= 20040130
AutoReq: no
AutoReqProv: no
%description
HTTrack is a free (GPL, libre/free software) 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
- 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 interrupted downloads.
- HTTrack is fully configurable, and has an integrated help system.
+ 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 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 interrupted downloads. HTTrack is fully
+ configurable, and has an integrated help system.
%track
prog httrack = {
- version = %{V_base}
+ version = %{V_major}
url = http://httrack.free.fr/mirror/
regex = httrack-(__VER__)\.tar\.gz
}
%prep
- %setup -q -n httrack-%{V_base}.%{V_minor}
+ %setup -q
+ %patch -p0
%build
- %{l_shtool} subst \
- -e 's,$(datadir)/doc,%{l_prefix}/doc,' \
- -e 's,$(datadir)/pixmaps,$(datadir)/httrack/pixmaps,' \
- -e 's,$(prefix)/share/applications,$(datadir)/httrack/desktop,' \
- html/Makefile.in
- # configure
+ CC="%{l_cc}" \
+ CFLAGS="%{l_cflags -O}" \
CPPFLAGS='-DHTS_ETCPATH=\"%{l_prefix}/etc/httrack\"' \
./configure \
--prefix=%{l_prefix} \
--sysconfdir=%{l_prefix}/etc/httrack \
--disable-shared
- # build
- %{l_make} %{l_mflags}
+ %{l_make} %{l_mflags -O}
%install
rm -rf $RPM_BUILD_ROOT
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/etc/httrack
- %{l_make} %{l_mflags} DESTDIR=$RPM_BUILD_ROOT install
+ %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
