rpms/kchmviewer/FC-6 .cvsignore, 1.4, 1.5 kchmviewer-desktop.diff, 1.1, 1.2 kchmviewer.spec, 1.5, 1.6 sources, 1.4, 1.5
Patrice Dumas (pertusus)
fedora-extras-commits at redhat.com
Sat Feb 17 08:36:46 UTC 2007
Author: pertusus
Update of /cvs/extras/rpms/kchmviewer/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25681
Modified Files:
.cvsignore kchmviewer-desktop.diff kchmviewer.spec sources
Log Message:
Feb 16 2007 Patrice Dumas <pertusus at free.fr> 2.7-2
- fixes in desktop file. Fix #229070
* Mon Jan 29 2007 Patrice Dumas <pertusus at free.fr> 2.7-1
- update to 2.7
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kchmviewer/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 22 Jul 2006 21:04:17 -0000 1.4
+++ .cvsignore 17 Feb 2007 08:36:13 -0000 1.5
@@ -1 +1 @@
-kchmviewer-2.6.tar.gz
+kchmviewer-2.7.tar.gz
kchmviewer-desktop.diff:
Index: kchmviewer-desktop.diff
===================================================================
RCS file: /cvs/extras/rpms/kchmviewer/FC-6/kchmviewer-desktop.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kchmviewer-desktop.diff 1 May 2006 08:35:31 -0000 1.1
+++ kchmviewer-desktop.diff 17 Feb 2007 08:36:13 -0000 1.2
@@ -1,16 +1,19 @@
---- kio-msits/kchmviewer.desktop-orig 2006-03-13 23:08:01.000000000 +0100
-+++ kio-msits/kchmviewer.desktop 2006-03-13 23:09:16.000000000 +0100
+--- kchmviewer-2.7/kio-msits/kchmviewer.desktop.fix 2006-04-02 03:15:03.000000000 +0200
++++ kchmviewer-2.7/kio-msits/kchmviewer.desktop 2007-02-16 22:56:55.000000000 +0100
@@ -1,11 +1,11 @@
[Desktop Entry]
Categories=Qt;KDE;Utility;
Encoding=UTF-8
+GenericName=CHM file viewer
Type=Application
- Exec=kchmviewer %U
- Icon=kchmviewer.png
+-Exec=kchmviewer %U
+-Icon=kchmviewer.png
-Comment=
-Terminal=0
++Exec=kchmviewer %f
++Icon=kchmviewer
+Terminal=false
Name=KchmViewer
Comment=A viewer of CHM (MS-Help) files
- MimeType=application/chm
+-MimeType=application/chm
++MimeType=application/chm;application/x-chm
Index: kchmviewer.spec
===================================================================
RCS file: /cvs/extras/rpms/kchmviewer/FC-6/kchmviewer.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kchmviewer.spec 12 Sep 2006 16:52:31 -0000 1.5
+++ kchmviewer.spec 17 Feb 2007 08:36:13 -0000 1.6
@@ -1,53 +1,29 @@
Name: kchmviewer
-Version: 2.6
+Version: 2.7
Release: 2%{?dist}
-Summary: CHM viewer
+Summary: CHM viewer with KDE support
Group: Applications/Publishing
License: GPL
URL: http://www.kchmviewer.net/
-Source0: http://download.sf.net/kchmviewer/kchmviewer-%{version}.tar.gz
+Source0: http://ovh.dl.sourceforge.net/sourceforge/kchmviewer/kchmviewer-%{version}.tar.gz
# fix the desktop file
Patch0: kchmviewer-desktop.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: qt-devel chmlib-devel
BuildRequires: desktop-file-utils kdelibs-devel
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
%description
KchmViewer is a chm (MS HTML help file format) viewer, written in C++.
-The main advantage of KchmViewer is extended support for non-English
-languages. Unlike others, KchmViewer in most cases correctly detects chm
-file encoding, correctly shows tables of context of Russian, Korean,
-Chinese and Japanese help files, and correctly searches in non-English
-help files (search for MBCS languages - ja/ko/ch is still in progress).
-
-- Completely safe and harmless. Does not support JavaScript in any way,
- optionally warns you before opening an external web page, or switching
- to another help file.
-- Shows an appropriate image for every TOC entry.
-- Has complete chm index support, including multiple index entries,
- cross-links and parent/child entries in index.
-- Persistent bookmarks support. Allows to store bookmarks even if
- "Favorites" window was not enabled for this chm file. Also stores the
- screen position for every bookmark. You can also edit/delete bookmarks.
-- For any opened chm file, stores the last opened window, search history,
- bookmark history, font size and so on, so when you open this file again,
- everything is always on the place.
-- Has easy and powerful search-in-page support.
-- Allows to increase or decrease the font size, so physically handicapped
- people can read texts easily.
-- Has standard Back/Forward/Home navigation.
-- Can print the opened pages on a standard printer (usually via CUPS).
-- Has complex search query support. You can use search queries like "lazy
- people" + learn -not.
+Unlike most existing CHM viewers for Unix, it uses Trolltech Qt widget
+library. It is compiled with full KDE support, including KDE widgets
+and KIO/KHTML.
%prep
%setup -q
-%patch
+%patch0 -p1 -b .fix
chmod -x kio-msits/msits.*
@@ -55,15 +31,15 @@
%configure --disable-static --with-kde --disable-rpath
make %{?_smp_mflags}
+
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-install -d -m755 ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
-install -m644 src/pics/cr48-app-kchmviewer.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/kchmviewer.png
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
+install -p -m644 src/pics/cr48-app-kchmviewer.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/kchmviewer.png
desktop-file-install --vendor fedora \
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
- --add-category X-Fedora \
--delete-original \
$RPM_BUILD_ROOT%{_datadir}/applnk/kchmviewer.desktop
@@ -71,11 +47,17 @@
%clean
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 || :
%postun
update-desktop-database &> /dev/null ||:
+touch --no-create %{_datadir}/icons/crystalsvg || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+
%files
%defattr(-,root,root,-)
@@ -88,7 +70,14 @@
%{_datadir}/services/msits.protocol
%{_datadir}/icons/crystalsvg/*/apps/kchmviewer.png
+
%changelog
+* Fri Feb 16 2007 Patrice Dumas <pertusus at free.fr> 2.7-2
+- fixes in desktop file. Fix #229070
+
+* Mon Jan 29 2007 Patrice Dumas <pertusus at free.fr> 2.7-1
+- update to 2.7
+
* Tue Sep 12 2006 Patrice Dumas <pertusus at free.fr> 2.6-2
- rebuild for FC6
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kchmviewer/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 22 Jul 2006 21:04:17 -0000 1.4
+++ sources 17 Feb 2007 08:36:13 -0000 1.5
@@ -1 +1 @@
-7898095c413b4262c5aff6bf5fcaf25b kchmviewer-2.6.tar.gz
+f7bb9fb4b10f351f93d32a5ebca5e078 kchmviewer-2.7.tar.gz
More information about the scm-commits
mailing list