rpms/kchmviewer/devel kchmviewer.spec,1.18,1.19

[Patrice Dumas]

Author: pertusus

Update of /cvs/extras/rpms/kchmviewer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30881

Modified Files:
	kchmviewer.spec 
Log Message:
* Mon Dec  8 2008 Patrice Dumas <pertusus at free.fr> 4.0-2
- reenable kde support



Index: kchmviewer.spec
===================================================================
RCS file: /cvs/extras/rpms/kchmviewer/devel/kchmviewer.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- kchmviewer.spec	4 Dec 2008 09:47:48 -0000	1.18
+++ kchmviewer.spec	8 Dec 2008 12:04:03 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           kchmviewer
 Version:        4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        CHM viewer with Qt support
 
 Group:          Applications/Publishing
@@ -17,6 +17,9 @@
 
 # for directories owning
 Requires:       kde-filesystem
+# for the crystalsvg directory owning.
+# in F10 owned by kdelibs3, hopefully this will change in the future.
+Requires:       %{_datadir}/icons/crystalsvg
 
 %description
 KchmViewer is a chm (MS HTML help file format) viewer, written in C++. 
@@ -39,9 +42,9 @@
 
 
 %build
-#%%cmake_kde4 .
+%cmake_kde4 .
 # with qmake-qt4 install is done by hand, and without kde4 support.
-qmake-qt4
+#qmake-qt4
 make VERBOSE=1 
 #%{?_smp_mflags}
 
@@ -49,8 +52,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -m0755 bin/kchmviewer $RPM_BUILD_ROOT%{_bindir}
+#mkdir -p $RPM_BUILD_ROOT%{_bindir}
+#install -m0755 bin/kchmviewer $RPM_BUILD_ROOT%{_bindir}
 
 # not installed in the default case in hicolor, only in crystalsvg.
 for r in 48 64 128; do
@@ -58,14 +61,17 @@
   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         \
-        src/kde/kchmviewer.desktop
 # let the application do it itself
+#mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+#desktop-file-install --vendor fedora                            \
+#        --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
+#        src/kde/kchmviewer.desktop
+
 #        --delete-original                                    \
 #        $RPM_BUILD_ROOT%{_datadir}/applications/kchmviewer.desktop
 
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/kde4/kchmviewer.desktop
+
 
 #%%find_lang %{name}
 
@@ -76,33 +82,36 @@
 
 %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 || :
 
 
-#-f %{name}.lang
-%files 
+%files
+# -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README COPYING ChangeLog FAQ
 %{_bindir}/kchmviewer
-#%{_datadir}/applications/kde4/*.desktop
-%{_datadir}/applications/*.desktop
-#%{_libdir}/kde4/kio_msits.so
-#%{_datadir}/kde4/services/msits.protocol
-#%{_datadir}/icons/crystalsvg/*/apps/kchmviewer.png
+%{_datadir}/applications/kde4/*.desktop
+#%{_datadir}/applications/*.desktop
+%{_libdir}/kde4/kio_msits.so
+%{_datadir}/kde4/services/msits.protocol
+%{_datadir}/icons/crystalsvg/*/apps/kchmviewer.png
 %{_datadir}/icons/hicolor/*/apps/kchmviewer.png
 
 
 %changelog
+* Mon Dec  8 2008 Patrice Dumas <pertusus at free.fr> 4.0-2
+- reenable kde support
+
 * Thu Dec  4 2008 Patrice Dumas <pertusus at free.fr> 4.0-1
 - update to 4.0