diff --git a/.cvsignore b/.cvsignore index a0a95ad..ad70010 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -kchmviewer-2.5.tar.gz +kchmviewer-2.6.tar.gz diff --git a/kchmviewer-2.5-iconstorage.h.patch b/kchmviewer-2.5-iconstorage.h.patch deleted file mode 100644 index 5824dbb..0000000 --- a/kchmviewer-2.5-iconstorage.h.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 c1022fb..9bfd817 100644 --- a/kchmviewer.spec +++ b/kchmviewer.spec @@ -1,15 +1,14 @@ Name: kchmviewer -Version: 2.5 +Version: 2.6 Release: 1%{?dist} Summary: CHM viewer -Group: Applications/Publishing +Group: Applications/Publishing License: GPL URL: http://www.kchmviewer.net/ -Source0: http://ovh.dl.sourceforge.net/kchmviewer/kchmviewer-%{version}.tar.gz +Source0: http://download.sf.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 @@ -49,7 +48,6 @@ help files (search for MBCS languages - ja/ko/ch is still in progress). %prep %setup -q %patch -%patch1 -p1 chmod -x kio-msits/msits.* @@ -91,6 +89,10 @@ update-desktop-database &> /dev/null ||: %{_datadir}/icons/crystalsvg/*/apps/kchmviewer.png %changelog +* Sat Jul 22 2006 Patrice Dumas 2.6-1 +- update to 2.6 +- remove upstreamed patch kchmviewer-2.5-iconstorage.h.patch + * Thu May 18 2006 Patrice Dumas 2.5-1 - update to 2.5 - patch from Jose Pedro Oliveira (jpo) diff --git a/sources b/sources index a304510..c9323de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -31aa10f89b92ec5323fef7c26b1e1eed kchmviewer-2.5.tar.gz +7898095c413b4262c5aff6bf5fcaf25b kchmviewer-2.6.tar.gz