From e824790c01d606004f1cc0c7da5f790deaac43b7 Mon Sep 17 00:00:00 2001
From: pertusus <pertusus@fedoraproject.org>
Date: May 18 2006 10:46:45 +0000
Subject: - update to 2.5

- patch from Jose Pedro Oliveira (jpo)

---

diff --git a/.cvsignore b/.cvsignore
index 6895cd9..a0a95ad 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-kchmviewer-2.0.tar.gz
+kchmviewer-2.5.tar.gz
diff --git a/kchmviewer-2.5-iconstorage.h.patch b/kchmviewer-2.5-iconstorage.h.patch
new file mode 100644
index 0000000..5824dbb
--- /dev/null
+++ b/kchmviewer-2.5-iconstorage.h.patch
@@ -0,0 +1,12 @@
+diff -ruN kchmviewer-2.5-orig/src/iconstorage.h kchmviewer-2.5/src/iconstorage.h
+--- kchmviewer-2.5-orig/src/iconstorage.h	2006-04-02 03:09:14.000000000 +0100
++++ kchmviewer-2.5/src/iconstorage.h	2006-05-18 01:05:57.000000000 +0100
+@@ -57,7 +57,7 @@
+ 	const QPixmap * getBookIconPixmap (unsigned int id);
+ 	const QPixmap * getToolbarPixmap (pixmap_index_t pix);
+ 	const QPixmap * getApplicationIcon();
+-	const QPixmap * KCHMIconStorage::getCloseWindowIcon();
++	const QPixmap * getCloseWindowIcon();
+ 
+ private:
+ 	const QPixmap * returnOrLoadImage (unsigned int id, const png_memory_image_t * image);
diff --git a/kchmviewer.spec b/kchmviewer.spec
index 4f68a09..c1022fb 100644
--- a/kchmviewer.spec
+++ b/kchmviewer.spec
@@ -1,14 +1,15 @@
 Name:           kchmviewer
-Version:        2.0
-Release:        4%{?dist}
+Version:        2.5
+Release:        1%{?dist}
 Summary:        CHM viewer
 
 Group: 		Applications/Publishing
 License:        GPL
 URL:            http://www.kchmviewer.net/
-Source0:        http://dl.sf.net/kchmviewer/kchmviewer-%{version}.tar.gz
+Source0:        http://ovh.dl.sourceforge.net/kchmviewer/kchmviewer-%{version}.tar.gz
 # fix the desktop file
 Patch0:         kchmviewer-desktop.diff
+Patch1:         kchmviewer-2.5-iconstorage.h.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel chmlib-devel 
@@ -48,6 +49,7 @@ help files (search for MBCS languages - ja/ko/ch is still in progress).
 %prep
 %setup -q
 %patch
+%patch1 -p1
 chmod -x kio-msits/msits.*
 
 
@@ -86,8 +88,13 @@ update-desktop-database &> /dev/null ||:
 %{_libdir}/kde3/kio_msits.so
 %{_libdir}/kde3/kio_msits.la
 %{_datadir}/services/msits.protocol
+%{_datadir}/icons/crystalsvg/*/apps/kchmviewer.png
 
 %changelog
+* Thu May 18 2006 Patrice Dumas <pertusus@free.fr> 2.5-1
+- update to 2.5
+- patch from Jose Pedro Oliveira (jpo)
+
 * Tue May 16 2006 Patrice Dumas <pertusus@free.fr> 2.0-4
 - remove the old menu entry file from /usr/share/applnk/
 
diff --git a/sources b/sources
index 8e1df14..a304510 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-94203642266aaecffdcc6c6d516f7635  kchmviewer-2.0.tar.gz
+31aa10f89b92ec5323fef7c26b1e1eed  kchmviewer-2.5.tar.gz