From 1485eff615a59da1669f55314a249f18636e5ed0 Mon Sep 17 00:00:00 2001
From: pertusus <pertusus@fedoraproject.org>
Date: Apr 02 2007 12:47:13 +0000
Subject: - update to 3.0


---

diff --git a/.cvsignore b/.cvsignore
index 226a49e..30ab97f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-kchmviewer-2.7.tar.gz
+kchmviewer-3.0.tar.gz
diff --git a/kchmviewer-2.0-desktop_fix.patch b/kchmviewer-2.0-desktop_fix.patch
new file mode 100644
index 0000000..7540cf1
--- /dev/null
+++ b/kchmviewer-2.0-desktop_fix.patch
@@ -0,0 +1,19 @@
+--- kchmviewer-3.0/lib/kio-msits/kchmviewer.desktop.desktop_fix	2007-03-07 10:20:54.000000000 +0100
++++ kchmviewer-3.0/lib/kio-msits/kchmviewer.desktop	2007-04-01 20:26:54.000000000 +0200
+@@ -1,11 +1,11 @@
+ [Desktop Entry]
+ Categories=Qt;KDE;Utility;
+ Encoding=UTF-8
++GenericName=CHM file viewer
+ Type=Application
+-Exec=kchmviewer %U
+-Icon=kchmviewer.png
+-Comment=
+-Terminal=0
++Exec=kchmviewer %f
++Icon=kchmviewer
++Terminal=false
+ Name=KchmViewer
+ Comment=A viewer of CHM (MS-Help) files
+-MimeType=application/chm
++MimeType=application/chm;application/x-chm
diff --git a/kchmviewer-desktop.diff b/kchmviewer-desktop.diff
deleted file mode 100644
index 10a064f..0000000
--- a/kchmviewer-desktop.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- kchmviewer-2.7/kio-msits/kchmviewer.desktop.fix	2006-04-02 03:15:03.000000000 +0200
-+++ kchmviewer-2.7/kio-msits/kchmviewer.desktop	2007-02-16 22:56:55.000000000 +0100
-@@ -1,11 +1,11 @@
- [Desktop Entry]
- Categories=Qt;KDE;Utility;
- Encoding=UTF-8
-+GenericName=CHM file viewer
- Type=Application
--Exec=kchmviewer %U
--Icon=kchmviewer.png
--Comment=
--Terminal=0
-+Exec=kchmviewer %f
-+Icon=kchmviewer
-+Terminal=false
- Name=KchmViewer
- Comment=A viewer of CHM (MS-Help) files
--MimeType=application/chm
-+MimeType=application/chm;application/x-chm
diff --git a/kchmviewer.spec b/kchmviewer.spec
index f9c3685..44735d1 100644
--- a/kchmviewer.spec
+++ b/kchmviewer.spec
@@ -1,14 +1,14 @@
 Name:           kchmviewer
-Version:        2.7
+Version:        3.0
 Release:        2%{?dist}
 Summary:        CHM viewer with KDE support
 
 Group:          Applications/Publishing
 License:        GPL
 URL:            http://www.kchmviewer.net/
-Source0:        http://ovh.dl.sourceforge.net/sourceforge/kchmviewer/kchmviewer-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/kchmviewer/kchmviewer-%{version}.tar.gz
 # fix the desktop file
-Patch0:         kchmviewer-desktop.diff
+Patch0:         kchmviewer-2.0-desktop_fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel chmlib-devel 
@@ -23,12 +23,13 @@ and KIO/KHTML.
 
 %prep
 %setup -q
-%patch0 -p1 -b .fix
-chmod -x kio-msits/msits.*
+%patch0 -p1 -b .desktop_fix
+chmod -x lib/kio-msits/msits.*
 
 
 %build
-%configure --disable-static --with-kde --disable-rpath
+%configure --disable-static --with-kde --disable-rpath \
+ --disable-dependency-tracking --disable-strict --disable-warnings
 make %{?_smp_mflags}
 
 
@@ -43,6 +44,11 @@ desktop-file-install --vendor fedora                            \
         --delete-original \
         $RPM_BUILD_ROOT%{_datadir}/applnk/kchmviewer.desktop
 
+# remove static libs, they have no interface, libkdeextra is too generic
+rm ${RPM_BUILD_ROOT}%{_libdir}/libchmfile.a 
+rm ${RPM_BUILD_ROOT}%{_libdir}/libkdeextra.a
+
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -59,7 +65,7 @@ touch --no-create %{_datadir}/icons/crystalsvg || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README COPYING ChangeLog
 %{_bindir}/kchmviewer
@@ -72,6 +78,9 @@ touch --no-create %{_datadir}/icons/crystalsvg || :
 
 
 %changelog
+* Sun Apr  1 2007 Patrice Dumas <pertusus@free.fr> 3.0-2
+- update to 3.0
+
 * Fri Feb 16 2007 Patrice Dumas <pertusus@free.fr> 2.7-2
 - fixes in desktop file. Fix #229070
 
diff --git a/sources b/sources
index 0ee220a..34dbd8c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f7bb9fb4b10f351f93d32a5ebca5e078  kchmviewer-2.7.tar.gz
+f14b7c5be4154dfc688bef7ebd3879ff  kchmviewer-3.0.tar.gz