From f1d062253268b9fc04567550d9de36d7a2b59649 Mon Sep 17 00:00:00 2001
From: Christopher Meng <i@cicku.me>
Date: Jul 25 2014 06:37:04 +0000
Subject: Merge branch 'master' into f20


---

diff --git a/.gitignore b/.gitignore
index b1aed1f..421d956 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ httrack-3.43-9C.tar.gz
 /httrack-3.48.13.tar.gz
 /httrack-3.48.14.tar.gz
 /httrack-3.48.17.tar.gz
+/httrack-3.48.18.tar.gz
diff --git a/httrack.spec b/httrack.spec
index df4c92a..ca45dac 100644
--- a/httrack.spec
+++ b/httrack.spec
@@ -1,5 +1,5 @@
 Name:           httrack
-Version:        3.48.17
+Version:        3.48.18
 Release:        1%{?dist}
 Summary:        Website copier and offline browser
 License:        GPLv2+
@@ -53,9 +53,6 @@ make %{?_smp_mflags}
 %make_install
 find %{buildroot} -type f -name "*.*a" -delete -print
 
-# Remove generic header from %%{_includedir}/httrack.
-rm -f %{buildroot}%{_includedir}/%{name}/config.h
-
 # Remove unnecessary dynamic libraries from %%{_libdir}/httrack.
 rm -rf %{buildroot}%{_libdir}/%{name}
 
@@ -132,6 +129,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/libhttrack.so
 
 %changelog
+* Mon Jul 21 2014 Christopher Meng <rpm@cicku.me> - 3.48.18-1
+- Update to 3.48.18
+- Add missing config.h back
+
 * Fri Jul 11 2014 Christopher Meng <rpm@cicku.me> - 3.48.17-1
 - Update to 3.48.17
 
diff --git a/sources b/sources
index b26a386..9d180c1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2948aa583ddd7344ced15affb4aa7edd  httrack-3.48.17.tar.gz
+1b837a29c50de8f19db555f8a5a1c2e2  httrack-3.48.18.tar.gz