rpms/kchmviewer/F-11 kchmviewer-4.0-no_msits.patch, NONE, 1.1 kchmviewer.spec, 1.20, 1.21

Mon Apr 27 15:36:37 UTC 2009

Author: rdieter

Update of /cvs/pkgs/rpms/kchmviewer/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1261/F-11

Modified Files:
	kchmviewer.spec 
Added Files:
	kchmviewer-4.0-no_msits.patch 
Log Message:
* Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.0-4
- fix conflicts with kdegraphics (#484861)
- optmize scriptlets
- ship only hicolor icons 
- cleanup, use kde4-macros


kchmviewer-4.0-no_msits.patch:

--- NEW FILE kchmviewer-4.0-no_msits.patch ---
diff -up kchmviewer-4.0/CMakeLists.txt.no_msits kchmviewer-4.0/CMakeLists.txt
--- kchmviewer-4.0/CMakeLists.txt.no_msits	2008-12-01 20:31:22.000000000 -0600
+++ kchmviewer-4.0/CMakeLists.txt	2009-04-27 10:23:02.371525695 -0500
@@ -18,6 +18,6 @@ ADD_DEFINITIONS( -DUSE_KDE )
 
 # Run in those subdirectories
 ADD_SUBDIRECTORY( lib/libchmfile )
-ADD_SUBDIRECTORY( lib/kio-msits )
+#ADD_SUBDIRECTORY( lib/kio-msits )
 ADD_SUBDIRECTORY( src )
 ADD_SUBDIRECTORY( po )


Index: kchmviewer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kchmviewer/F-11/kchmviewer.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- kchmviewer.spec	25 Feb 2009 10:23:20 -0000	1.20
+++ kchmviewer.spec	27 Apr 2009 15:36:07 -0000	1.21
@@ -1,7 +1,8 @@
+
 Name:           kchmviewer
 Version:        4.0
-Release:        3%{?dist}
-Summary:        CHM viewer with Qt support
+Release:        4%{?dist}
+Summary:        CHM viewer
 
 Group:          Applications/Publishing
 License:        GPLv2+
@@ -10,27 +11,26 @@
 Source0:        http://downloads.sourceforge.net/kchmviewer/kchmviewer-%{version}.tar.gz
 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
-# for the crystalsvg directory owning.
-# in F10 owned by kdelibs3, hopefully this will change in the future.
-Requires:       %{_datadir}/icons/crystalsvg
+Patch1: kchmviewer-4.0-no_msits.patch
+
+BuildRequires:  chmlib-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
+BuildRequires:  kdelibs4-devel
+
+Requires: kio_msits
 
 %description
-KchmViewer is a chm (MS HTML help file format) viewer, written in C++. 
-It uses the Qt widget library. 
-#It is compiled with full KDE support, including KDE widgets 
-#and KIO/KHTML.
+KchmViewer is a chm (MS HTML help file format) viewer.
 
 
 %prep
 %setup -q -n kchmviewer-%{version}
 
+%patch1 -p1 -b .no_msits
+
+#chmod -x lib/kio-msits/msits.*
+
 # don't know what the encoding is. The strange character sequence is
 # <EF><BF><BD>, which could be in utf8 U-0000FFFD, a boundary condition
 # http://www.w3.org/2001/06/utf-8-wrong/UTF-8-test.html
@@ -38,42 +38,28 @@
 #touch -r FAQ FAQ.utf8
 #mv FAQ.utf8 FAQ
 
-chmod -x lib/kio-msits/msits.*
-
 
 %build
-%cmake_kde4 .
-# with qmake-qt4 install is done by hand, and without kde4 support.
-#qmake-qt4
-make VERBOSE=1 
-#%{?_smp_mflags}
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %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
-  mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${r}x${r}/apps/
-  install -p -m644 src/kde/cr${r}-app-kchmviewer.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${r}x${r}/apps/kchmviewer.png
-done
-
-# 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
+rm -rf $RPM_BUILD_ROOT 
 
-#        --delete-original                                    \
-#        $RPM_BUILD_ROOT%{_datadir}/applications/kchmviewer.desktop
+make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/kde4/kchmviewer.desktop
+# make icons available for all themes/desktops
+mv $RPM_BUILD_ROOT%{_kde4_iconsdir}/crystalsvg \
+   $RPM_BUILD_ROOT%{_kde4_iconsdir}/hicolor
 
 
-#%%find_lang %{name}
+%check
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/kde4/kchmviewer.desktop
 
 
 %clean
@@ -81,34 +67,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/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
 
 %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/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+fi
 
 
 %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}/icons/hicolor/*/apps/kchmviewer.png
+%{_kde4_bindir}/kchmviewer
+%{_kde4_datadir}/applications/kde4/*.desktop
+%{_kde4_iconsdir}/hicolor/*/apps/kchmviewer.*
 
 
 %changelog
+* Mon Apr 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.0-4
+- fix conflicts with kdegraphics (#484861)
+- optmize scriptlets
+- ship only hicolor icons 
+- cleanup, use kde4-macros
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


