rpms/kchmviewer/devel kchmviewer-2.0-desktop_fix.patch, NONE, 1.1 kchmviewer.spec, 1.8, 1.9 kchmviewer-desktop.diff, 1.2, NONE

[Patrice Dumas (pertusus)]

Author: pertusus

Update of /cvs/extras/rpms/kchmviewer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31275

Modified Files:
	kchmviewer.spec 
Added Files:
	kchmviewer-2.0-desktop_fix.patch 
Removed Files:
	kchmviewer-desktop.diff 
Log Message:
clog

kchmviewer-2.0-desktop_fix.patch:

--- NEW FILE kchmviewer-2.0-desktop_fix.patch ---
--- 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


Index: kchmviewer.spec
===================================================================
RCS file: /cvs/extras/rpms/kchmviewer/devel/kchmviewer.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kchmviewer.spec	16 Feb 2007 22:08:35 -0000	1.8
+++ kchmviewer.spec	2 Apr 2007 11:45:38 -0000	1.9
@@ -1,14 +1,14 @@
 Name:           kchmviewer
-Version:        2.7
-Release:        2%{?dist}
+Version:        3.0
+Release:        1%{?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 @@
 
 %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 @@
         --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 @@
 %{_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 @@
 
 
 %changelog
+* Sun Apr  1 2007 Patrice Dumas <pertusus at free.fr> 3.0-1
+- update to 3.0
+
 * Fri Feb 16 2007 Patrice Dumas <pertusus at free.fr> 2.7-2
 - fixes in desktop file. Fix #229070
 


--- kchmviewer-desktop.diff DELETED ---