[httrack] Update to 3.18.14 Give a try on tests.

Christopher Meng cicku at fedoraproject.org
Sat Jul 12 12:00:31 UTC 2014


commit de5fe4ba000521dea813f7d6c3fa22c7508328af
Author: Christopher Meng <i at cicku.me>
Date:   Sat Jul 12 20:00:27 2014 +0800

    Update to 3.18.14
    Give a try on tests.

 .gitignore   |    1 +
 httrack.spec |   24 ++++++++++++------------
 sources      |    2 +-
 3 files changed, 14 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 78ed8c4..b6326f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ httrack-3.43-9C.tar.gz
 /httrack-3.48.3.tar.gz
 /httrack-3.48.9.tar.gz
 /httrack-3.48.13.tar.gz
+/httrack-3.48.14.tar.gz
diff --git a/httrack.spec b/httrack.spec
index c520735..8939cc5 100644
--- a/httrack.spec
+++ b/httrack.spec
@@ -1,10 +1,5 @@
-%if 0%{?fc7}
-%else
-  %global _remove_encoding --remove-key Encoding
-%endif
-
 Name:           httrack
-Version:        3.48.13
+Version:        3.48.14
 Release:        1%{?dist}
 Summary:        Website copier and offline browser
 License:        GPLv2+
@@ -32,7 +27,7 @@ Summary:        Development files for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description    devel
-The %{name}-devel package contains libraries and header files for
+This package contains libraries and header files for
 developing applications that use %{name}.
 
 %prep
@@ -43,8 +38,7 @@ iconv --from-code ISO8859-1 --to-code UTF-8 ./html/contact.html \
   --output contact.utf-8 && mv contact.utf-8 ./html/contact.html
 
 %build
-# This package needs internet connection to test, Koji doesn't support it.
-%configure --disable-static
+%configure --disable-static --enable-online-unit-tests=no
 
 # Remove rpaths.
 rm -f ./libtool
@@ -53,7 +47,7 @@ cp %{_bindir}/libtool .
 # Omit unused direct shared library dependencies.
 sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' libtool
 
-make %{?_smp_mflags}
+%make_build
 
 %install
 %make_install
@@ -79,14 +73,17 @@ mv %{buildroot}%{_datadir}/%{name}/templates .
 rm -rf ./html
 cp -ar %{buildroot}%{_datadir}/%{name}/html .
 
-desktop-file-install %{?_remove_encoding} --delete-original \
+desktop-file-install --delete-original \
   --dir %{buildroot}%{_datadir}/applications \
   %{buildroot}%{_datadir}/applications/WebHTTrack.desktop
 
-desktop-file-install %{?_remove_encoding} --delete-original \
+desktop-file-install --delete-original \
   --dir %{buildroot}%{_datadir}/applications \
   %{buildroot}%{_datadir}/applications/WebHTTrack-Websites.desktop
 
+%check
+make check
+
 %pretrans
 if [ $1 = 0 ]; then
 	# workaround rpm bug (replacing directory with symlink fails)
@@ -135,6 +132,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/libhttrack.so
 
 %changelog
+* Fri Jul 11 2014 Christopher Meng <rpm at cicku.me> - 3.48.14-1
+- Update to 3.48.14
+
 * Fri Jun 13 2014 Christopher Meng <rpm at cicku.me> - 3.48.13-1
 - Update to 3.48.13
 
diff --git a/sources b/sources
index a0f5013..4403ecc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7cad6626bed7cef087b404fde1bdd8ea  httrack-3.48.13.tar.gz
+9a11f5c9d1d457b08bbc9afcc88f0936  httrack-3.48.14.tar.gz


More information about the scm-commits mailing list