rpms/kchmviewer/F-9 .cvsignore, 1.9, 1.10 kchmviewer.spec, 1.16, 1.17 sources, 1.9, 1.10

[Patrice Dumas]

Author: pertusus

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

Modified Files:
	.cvsignore kchmviewer.spec sources 
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/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	16 Nov 2008 14:33:35 -0000	1.9
+++ .cvsignore	4 Dec 2008 10:15:44 -0000	1.10
@@ -1 +1 @@
-kchmviewer-4.0beta3.tar.gz
+kchmviewer-4.0.tar.gz


Index: kchmviewer.spec
===================================================================
RCS file: /cvs/extras/rpms/kchmviewer/F-9/kchmviewer.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- kchmviewer.spec	16 Nov 2008 14:33:36 -0000	1.16
+++ kchmviewer.spec	4 Dec 2008 10:15:44 -0000	1.17
@@ -1,16 +1,13 @@
 Name:           kchmviewer
 Version:        4.0
-Release:        0.3.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
@@ -29,13 +26,14 @@
 
 
 %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.*
 
@@ -53,6 +51,7 @@
 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/
@@ -104,8 +103,11 @@
 
 
 %changelog
-* Sun Nov 16 2008 Patrice Dumas <pertusus at free.fr> 4.0-0.3.beta3
-- update to 4.0beta3, should fix #458573
+* 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
 
 * Thu Feb 14 2008 Patrice Dumas <pertusus at free.fr> 4.0-0.2.beta2
 - update to 4.0beta2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kchmviewer/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	16 Nov 2008 14:33:36 -0000	1.9
+++ sources	4 Dec 2008 10:15:44 -0000	1.10
@@ -1 +1 @@
-06c94380a5380a613b808b9e05a401f7  kchmviewer-4.0beta3.tar.gz
+5e6b853b00f17f69a3368ce78355aba9  kchmviewer-4.0.tar.gz