rpms/kchmviewer/F-10 kchmviewer.spec,1.17,1.18

[Patrice Dumas]

Author: pertusus

Update of /cvs/extras/rpms/kchmviewer/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5262

Modified Files:
	kchmviewer.spec 
Log Message:
Don't build-in kde support, since kde build is broken by missing kde package
deps or broken cmake macros.



Index: kchmviewer.spec
===================================================================
RCS file: /cvs/extras/rpms/kchmviewer/F-10/kchmviewer.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kchmviewer.spec	1 Sep 2008 15:31:15 -0000	1.17
+++ kchmviewer.spec	21 Nov 2008 09:10:20 -0000	1.18
@@ -13,7 +13,7 @@
 Patch1:         kchmviewer-4.0-plugin_install.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  qt4-devel chmlib-devel giflib-devel
+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
@@ -41,13 +41,18 @@
 
 
 %build
-%cmake_kde4 .
-make VERBOSE=1 %{?_smp_mflags}
+#%%cmake_kde4 .
+# with qmake-qt4 install is done by hand, and without kde4 support.
+qmake-qt4
+make VERBOSE=1 
+#%{?_smp_mflags}
 
 
 %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}
 
 # not installed in the default case in hicolor, only in crystalsvg.
 for r in 48 64 128; do
@@ -55,10 +60,11 @@
   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         \
 #        --delete-original                                    \
 #        $RPM_BUILD_ROOT%{_datadir}/applications/kchmviewer.desktop
 
@@ -72,15 +78,15 @@
 
 %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 || :
 
@@ -90,15 +96,16 @@
 %defattr(-,root,root,-)
 %doc README COPYING ChangeLog FAQ
 %{_bindir}/kchmviewer
-%{_datadir}/applications/kde4/*.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
-* Wed Aug 13 2008 Patrice Dumas <pertusus at free.fr> 4.0-0.4.beta3
+* Sun Nov 16 2008 Patrice Dumas <pertusus at free.fr> 4.0-0.4.beta3
 - update to 4.0beta3
 
 * Thu Feb 14 2008 Patrice Dumas <pertusus at free.fr> 4.0-0.2.beta2