From bf2b8be7f5a8d578f448f7a59c3868235220d1f3 Mon Sep 17 00:00:00 2001 From: pertusus Date: Dec 04 2008 09:47:48 +0000 Subject: - update to 4.0 --- diff --git a/.cvsignore b/.cvsignore index af93678..af63bf8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -kchmviewer-4.0beta3.tar.gz +kchmviewer-4.0.tar.gz 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-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 70df58d..0520e0b 100644 --- a/kchmviewer.spec +++ b/kchmviewer.spec @@ -1,19 +1,16 @@ Name: kchmviewer Version: 4.0 -Release: 0.4.beta3%{?dist} +Release: 1%{?dist} Summary: CHM viewer with Qt support Group: Applications/Publishing License: GPLv2+ URL: http://www.kchmviewer.net/ -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-4.0-desktop_fix.patch -Patch1: kchmviewer-4.0-plugin_install.patch +#Source0: http://www.kchmviewer.net/files/kchmviewer-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/kchmviewer/kchmviewer-%{version}.tar.gz 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 @@ -29,25 +26,31 @@ It uses the Qt widget library. %prep -%setup -q -n kchmviewer-%{version}beta3 -%patch0 -p1 -b .desktop_fix -%patch1 -p1 -b .plugin_install +%setup -q -n kchmviewer-%{version} -iconv -f latin1 -t utf8 < FAQ > FAQ.utf8 -touch -r FAQ FAQ.utf8 -mv FAQ.utf8 FAQ +# 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 +#iconv -f latin1 -t utf8 < FAQ > FAQ.utf8 +#touch -r FAQ FAQ.utf8 +#mv FAQ.utf8 FAQ chmod -x lib/kio-msits/msits.* %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 +58,11 @@ for r in 48 64 128; do 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 +76,15 @@ 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 || : @@ -90,14 +94,18 @@ touch --no-create %{_datadir}/icons/hicolor || : %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 +* Thu Dec 4 2008 Patrice Dumas 4.0-1 +- update to 4.0 + * Wed Aug 13 2008 Patrice Dumas 4.0-0.4.beta3 - update to 4.0beta3 diff --git a/sources b/sources index f46cb21..2b8a743 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -06c94380a5380a613b808b9e05a401f7 kchmviewer-4.0beta3.tar.gz +5e6b853b00f17f69a3368ce78355aba9 kchmviewer-4.0.tar.gz