rpms/kchmviewer/devel kchmviewer-4.0-desktop_fix.patch, NONE, 1.1 kchmviewer-4.0-plugin_install.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 kchmviewer.spec, 1.15, 1.16 sources, 1.8, 1.9 kchmviewer-2.0-desktop_fix.patch, 1.2, NONE

Thu Aug 14 16:36:02 UTC 2008

Author: pertusus

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

Modified Files:
	.cvsignore kchmviewer.spec sources 
Added Files:
	kchmviewer-4.0-desktop_fix.patch 
	kchmviewer-4.0-plugin_install.patch 
Removed Files:
	kchmviewer-2.0-desktop_fix.patch 
Log Message:
* Wed Aug 13 2008 Patrice Dumas <pertusus at free.fr> 4.0-0.3.beta3
- update to 4.0beta3


kchmviewer-4.0-desktop_fix.patch:

--- NEW FILE kchmviewer-4.0-desktop_fix.patch ---
diff -up kchmviewer-4.0beta3/src/kde/kchmviewer.desktop.desktop_fix kchmviewer-4.0beta3/src/kde/kchmviewer.desktop
--- kchmviewer-4.0beta3/src/kde/kchmviewer.desktop.desktop_fix	2008-08-13 15:44:40.000000000 +0200
+++ kchmviewer-4.0beta3/src/kde/kchmviewer.desktop	2008-08-13 15:47:13.000000000 +0200
@@ -4,8 +4,8 @@ Categories=Qt;KDE;Utility;
 Encoding=UTF-8
 Terminal=false
 Type=Application
-Exec=kchmviewer %U
+Exec=kchmviewer %f
 Icon=kchmviewer
 GenericName=A viewer for CHM files
 Comment=A viewer of CHM (MS-Help) files
-MimeType=application/chm
+MimeType=application/chm;application/x-chm;

kchmviewer-4.0-plugin_install.patch:

--- NEW FILE kchmviewer-4.0-plugin_install.patch ---
diff -up kchmviewer-4.0beta3/lib/kio-msits/CMakeLists.txt.plugin_install kchmviewer-4.0beta3/lib/kio-msits/CMakeLists.txt
--- kchmviewer-4.0beta3/lib/kio-msits/CMakeLists.txt.plugin_install	2008-08-13 18:30:58.000000000 +0200
+++ kchmviewer-4.0beta3/lib/kio-msits/CMakeLists.txt	2008-08-13 18:31:18.000000000 +0200
@@ -1,6 +1,6 @@
 SET( kioSources msits.cpp )
 KDE4_ADD_PLUGIN( kio_msits ${kioSources} )
 TARGET_LINK_LIBRARIES( kio_msits ${KDE4_KIO_LIBS} ${LIBCHM_LIBRARY} )
-INSTALL( TARGETS kio_msits DESTINATION ${KDE4_LIB_INSTALL_DIR} )
+INSTALL( TARGETS kio_msits DESTINATION ${PLUGIN_INSTALL_DIR} )
 INSTALL( FILES msits.protocol DESTINATION ${KDE4_SERVICES_INSTALL_DIR} )
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kchmviewer/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	14 Feb 2008 08:18:18 -0000	1.8
+++ .cvsignore	14 Aug 2008 16:35:32 -0000	1.9
@@ -1 +1 @@
-kchmviewer-4.0beta2.tar.gz
+kchmviewer-4.0beta3.tar.gz


Index: kchmviewer.spec
===================================================================
RCS file: /cvs/extras/rpms/kchmviewer/devel/kchmviewer.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kchmviewer.spec	14 Feb 2008 08:33:13 -0000	1.15
+++ kchmviewer.spec	14 Aug 2008 16:35:32 -0000	1.16
@@ -1,18 +1,25 @@
 Name:           kchmviewer
 Version:        4.0
-Release:        0.2.beta2%{?dist}
+Release:        0.3.beta3%{?dist}
 Summary:        CHM viewer with Qt support
 
 Group:          Applications/Publishing
 License:        GPLv2+
 URL:            http://www.kchmviewer.net/
-Source0:        http://downloads.sourceforge.net/kchmviewer/kchmviewer-%{version}beta2.tar.gz
+Source0:        http://www.kchmviewer.net/files/kchmviewer-%{version}beta3.tar.gz
+#Source0:        http://downloads.sourceforge.net/kchmviewer/kchmviewer-%{version}beta3.tar.gz
 # fix the desktop file
-Patch0:         kchmviewer-2.0-desktop_fix.patch
+Patch0:         kchmviewer-4.0-desktop_fix.patch
+Patch1:         kchmviewer-4.0-plugin_install.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel chmlib-devel 
 BuildRequires:  desktop-file-utils kdelibs4-devel
+# for the %%cmake_kde4 macro (it is also a kdelibs4 dependency)
+# BuildRequires:  kde-filesystem
+
+# for directories owning
+Requires:       kde-filesystem
 
 %description
 KchmViewer is a chm (MS HTML help file format) viewer, written in C++. 
@@ -22,61 +29,58 @@
 
 
 %prep
-%setup -q -n kchmviewer-%{version}beta2
+%setup -q -n kchmviewer-%{version}beta3
 %patch0 -p1 -b .desktop_fix
+%patch1 -p1 -b .plugin_install
 
 iconv -f latin1 -t utf8 < FAQ > FAQ.utf8
 touch -r FAQ FAQ.utf8
 mv FAQ.utf8 FAQ
 
-#chmod -x lib/kio-msits/msits.*
+chmod -x lib/kio-msits/msits.*
 
 
 %build
-qmake-qt4
-#%{?_smp_mflags}
-make 
+%cmake_kde4 .
+make VERBOSE=1 %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# no install target
-#make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -m0755 bin/kchmviewer $RPM_BUILD_ROOT%{_bindir}
-# to be done automatically when kde support is reenabled
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
+make install DESTDIR=$RPM_BUILD_ROOT
+
+# not installed in the default case in hicolor, only in crystalsvg.
 for r in 48 64 128; do
   mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${r}x${r}/apps/
-  install -p -m644 src/pics/cr${r}-app-kchmviewer.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${r}x${r}/apps/kchmviewer.png
+  install -p -m644 src/kde/cr${r}-app-kchmviewer.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${r}x${r}/apps/kchmviewer.png
 done
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora                            \
-        --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
-        lib/kio-msits/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
+# let the application do it itself
+#mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+#desktop-file-install --vendor fedora                            \
+#        --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
+#        --delete-original                                    \
+#        $RPM_BUILD_ROOT%{_datadir}/applications/kchmviewer.desktop
+
 
 #%%find_lang %{name}
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %post
 update-desktop-database &> /dev/null ||:
-#touch --no-create %{_datadir}/icons/crystalsvg || :
-#%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+touch --no-create %{_datadir}/icons/crystalsvg || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %postun
 update-desktop-database &> /dev/null ||:
-#touch --no-create %{_datadir}/icons/crystalsvg || :
-#%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+touch --no-create %{_datadir}/icons/crystalsvg || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
@@ -86,16 +90,17 @@
 %defattr(-,root,root,-)
 %doc README COPYING ChangeLog FAQ
 %{_bindir}/kchmviewer
-%{_datadir}/applications/*
-#%{_datadir}/pixmaps/*
-#%{_libdir}/kde3/kio_msits.so
-#%{_libdir}/kde3/kio_msits.la
-#%{_datadir}/services/msits.protocol
-#%{_datadir}/icons/crystalsvg/*/apps/kchmviewer.png
+%{_datadir}/applications/kde4/*.desktop
+%{_libdir}/kde4/kio_msits.so
+%{_datadir}/kde4/services/msits.protocol
+%{_datadir}/icons/crystalsvg/*/apps/kchmviewer.png
 %{_datadir}/icons/hicolor/*/apps/kchmviewer.png
 
 
 %changelog
+* Wed Aug 13 2008 Patrice Dumas <pertusus at free.fr> 4.0-0.3.beta3
+- update to 4.0beta3
+
 * Thu Feb 14 2008 Patrice Dumas <pertusus at free.fr> 4.0-0.2.beta2
 - update to 4.0beta2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kchmviewer/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	14 Feb 2008 08:18:18 -0000	1.8
+++ sources	14 Aug 2008 16:35:32 -0000	1.9
@@ -1 +1 @@
-a81d8f84458824b93ab788083ecd2120  kchmviewer-4.0beta2.tar.gz
+06c94380a5380a613b808b9e05a401f7  kchmviewer-4.0beta3.tar.gz


--- kchmviewer-2.0-desktop_fix.patch DELETED ---


