diff --git a/.cvsignore b/.cvsignore index af63bf8..8bb9980 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -kchmviewer-4.0.tar.gz +kchmviewer-5.1.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..b398047 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +kchmviewer-5_1-1_fc13:HEAD:kchmviewer-5.1-1.fc13.src.rpm:1271520090 diff --git a/kchmviewer-4.0-no_msits.patch b/kchmviewer-4.0-no_msits.patch deleted file mode 100644 index 602015a..0000000 --- a/kchmviewer-4.0-no_msits.patch +++ /dev/null @@ -1,11 +0,0 @@ -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-5.1-no_msits.patch b/kchmviewer-5.1-no_msits.patch new file mode 100644 index 0000000..6c07e06 --- /dev/null +++ b/kchmviewer-5.1-no_msits.patch @@ -0,0 +1,12 @@ +diff -up kchmviewer-5.1/CMakeLists.txt.no_msits kchmviewer-5.1/CMakeLists.txt +--- kchmviewer-5.1/CMakeLists.txt.no_msits 2010-03-19 12:53:57.000000000 +0100 ++++ kchmviewer-5.1/CMakeLists.txt 2010-03-19 12:54:07.000000000 +0100 +@@ -18,7 +18,7 @@ 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 ) + ADD_SUBDIRECTORY( packages ) diff --git a/kchmviewer.spec b/kchmviewer.spec index 6e31929..65b6ecc 100644 --- a/kchmviewer.spec +++ b/kchmviewer.spec @@ -1,17 +1,15 @@ Name: kchmviewer -Version: 4.0 -Release: 5%{?dist} +Version: 5.1 +Release: 1%{?dist} Summary: CHM viewer Group: Applications/Publishing -License: GPLv2+ +License: GPLv3+ URL: http://www.kchmviewer.net/ -#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) -Patch1: kchmviewer-4.0-no_msits.patch +Patch1: kchmviewer-5.1-no_msits.patch BuildRequires: chmlib-devel BuildRequires: desktop-file-utils @@ -25,7 +23,7 @@ KchmViewer is a chm (MS HTML help file format) viewer. %prep -%setup -q -n kchmviewer-%{version} +%setup -q -n build-%{version} %patch1 -p1 -b .no_msits @@ -49,17 +47,16 @@ make %{?_smp_mflags} -C %{_target_platform} %install -rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform} -# make icons available for all themes/desktops -mv $RPM_BUILD_ROOT%{_kde4_iconsdir}/crystalsvg \ - $RPM_BUILD_ROOT%{_kde4_iconsdir}/hicolor +install -Dpm 644 packages/%{name}.png $RPM_BUILD_ROOT%{_kde4_iconsdir}/hicolor/128x128/apps/%{name}.png +%find_lang kchmviewer --with-kde %check -desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/kde4/kchmviewer.desktop +desktop-file-validate $RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4/kchmviewer.desktop %clean @@ -80,9 +77,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : update-desktop-database -q &> /dev/null ||: fi - -%files -# -f %{name}.lang +%files -f kchmviewer.lang %defattr(-,root,root,-) %doc README COPYING ChangeLog FAQ %{_kde4_bindir}/kchmviewer @@ -91,13 +86,21 @@ fi %changelog +* Sat Apr 17 2010 LI Rui Bin - 5.1-1 +- correct License tag +- remove BuildRoot tag + +* Fri Mar 19 2010 Emilio Scalise - 5.1-0 +- update to 5.1 +- provides new translations + * Fri Jul 24 2009 Fedora Release Engineering - 4.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild * Mon Apr 27 2009 Rex Dieter - 4.0-4 - fix conflicts with kdegraphics (#484861) - optimize scriptlets -- ship only hicolor icons +- ship only hicolor icons - cleanup, use kde4-macros * Wed Feb 25 2009 Fedora Release Engineering - 4.0-3 diff --git a/sources b/sources index 2b8a743..c1a3be8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5e6b853b00f17f69a3368ce78355aba9 kchmviewer-4.0.tar.gz +9b68c3e233fe3d8e16251ba95526a493 kchmviewer-5.1.tar.gz