diff --git a/kchmviewer-4.0-desktop_fix.patch b/kchmviewer-4.0-desktop_fix.patch deleted file mode 100644 index 4262827..0000000 --- a/kchmviewer-4.0-desktop_fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -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; diff --git a/kchmviewer-4.0-no_msits.patch b/kchmviewer-4.0-no_msits.patch new file mode 100644 index 0000000..602015a --- /dev/null +++ b/kchmviewer-4.0-no_msits.patch @@ -0,0 +1,11 @@ +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 ) diff --git a/kchmviewer-4.0-plugin_install.patch b/kchmviewer-4.0-plugin_install.patch deleted file mode 100644 index 8e9fc9c..0000000 --- a/kchmviewer-4.0-plugin_install.patch +++ /dev/null @@ -1,11 +0,0 @@ -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} ) - diff --git a/kchmviewer.spec b/kchmviewer.spec index 0520e0b..d41e1a7 100644 --- a/kchmviewer.spec +++ b/kchmviewer.spec @@ -1,7 +1,8 @@ + Name: kchmviewer Version: 4.0 -Release: 1%{?dist} -Summary: CHM viewer with Qt support +Release: 4%{?dist} +Summary: CHM viewer Group: Applications/Publishing License: GPLv2+ @@ -10,24 +11,26 @@ URL: http://www.kchmviewer.net/ 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 +Patch1: kchmviewer-4.0-no_msits.patch + +BuildRequires: chmlib-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: kdelibs4-devel -# for directories owning -Requires: kde-filesystem +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 # , which could be in utf8 U-0000FFFD, a boundary condition # http://www.w3.org/2001/06/utf-8-wrong/UTF-8-test.html @@ -35,39 +38,28 @@ It uses the Qt widget library. #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} +rm -rf $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/kde/cr${r}-app-kchmviewer.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${r}x${r}/apps/kchmviewer.png -done +make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform} -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 -# --delete-original \ -# $RPM_BUILD_ROOT%{_datadir}/applications/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 @@ -75,34 +67,42 @@ 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/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 -#-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}/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 - 4.0-4 +- fix conflicts with kdegraphics (#484861) +- optimize scriptlets +- ship only hicolor icons +- cleanup, use kde4-macros + +* Wed Feb 25 2009 Fedora Release Engineering - 4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Dec 8 2008 Patrice Dumas 4.0-2 +- reenable kde support + * Thu Dec 4 2008 Patrice Dumas 4.0-1 - update to 4.0