rpms/kchmviewer/devel .cvsignore, 1.9, 1.10 kchmviewer.spec, 1.17, 1.18 sources, 1.9, 1.10 kchmviewer-4.0-desktop_fix.patch, 1.1, NONE kchmviewer-4.0-plugin_install.patch, 1.1, NONE

[Patrice Dumas]

Author: pertusus

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

Modified Files:
	.cvsignore kchmviewer.spec sources 
Removed Files:
	kchmviewer-4.0-desktop_fix.patch 
	kchmviewer-4.0-plugin_install.patch 
Log Message:
* Thu Dec  4 2008 Patrice Dumas <pertusus at free.fr> 4.0-1
- update to 4.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kchmviewer/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	14 Aug 2008 16:35:32 -0000	1.9
+++ .cvsignore	4 Dec 2008 09:47:48 -0000	1.10
@@ -1 +1 @@
-kchmviewer-4.0beta3.tar.gz
+kchmviewer-4.0.tar.gz


Index: kchmviewer.spec
===================================================================
RCS file: /cvs/extras/rpms/kchmviewer/devel/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	4 Dec 2008 09:47:48 -0000	1.18
@@ -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 @@
 
 
 %prep
-%setup -q -n kchmviewer-%{version}beta3
-%patch0 -p1 -b .desktop_fix
-%patch1 -p1 -b .plugin_install
-
-iconv -f latin1 -t utf8 < FAQ > FAQ.utf8
-touch -r FAQ FAQ.utf8
-mv FAQ.utf8 FAQ
+%setup -q -n kchmviewer-%{version}
+
+# 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
+#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 @@
   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 @@
 
 %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 @@
 %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 <pertusus at free.fr> 4.0-1
+- update to 4.0
+
 * Wed Aug 13 2008 Patrice Dumas <pertusus at free.fr> 4.0-0.4.beta3
 - update to 4.0beta3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kchmviewer/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	14 Aug 2008 16:35:32 -0000	1.9
+++ sources	4 Dec 2008 09:47:48 -0000	1.10
@@ -1 +1 @@
-06c94380a5380a613b808b9e05a401f7  kchmviewer-4.0beta3.tar.gz
+5e6b853b00f17f69a3368ce78355aba9  kchmviewer-4.0.tar.gz


--- kchmviewer-4.0-desktop_fix.patch DELETED ---


--- kchmviewer-4.0-plugin_install.patch DELETED ---