packages (DEVEL): kchmviewer/kchmviewer.spec, kchmviewer/kchmviewer-no_msit...

[arvenil]

Author: arvenil                      Date: Sun Jun 13 16:45:15 2010 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- up to 5.2
- added patch for missing sources
- added patch for using the version of kio_msits.so provided by kdegraphics
  to avoid conflicts between packages
- kchmviewer uses now qt4 and kde4

---- Files affected:
packages/kchmviewer:
   kchmviewer.spec (1.22 -> 1.22.2.1) , kchmviewer-no_msits.patch (NONE -> 1.1)  (NEW), kchmviewer-missed_src.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/kchmviewer/kchmviewer.spec
diff -u packages/kchmviewer/kchmviewer.spec:1.22 packages/kchmviewer/kchmviewer.spec:1.22.2.1
--- packages/kchmviewer/kchmviewer.spec:1.22	Sun Jun 17 10:00:31 2007
+++ packages/kchmviewer/kchmviewer.spec	Sun Jun 13 18:45:09 2010
@@ -1,31 +1,24 @@
 # $Revision$, $Date$
-#
-# Conditional build:
-%bcond_with	kde		# enable KDE support
-%bcond_without	arts		# build without aRts default=no
-#
 Summary:	KchmViewer - a CHM (MS HTML help file format) viewer
 Summary(pl.UTF-8):	KchmViewer - przeglądarka CHM (formatu plików pomocy MS HTML)
 Name:		kchmviewer
-Version:	3.1
-Release:	1	
+Version:	5.2
+Release:	1
 License:	GPL v2
 Group:		Applications/Publishing
-Source0:	http://dl.sourceforge.net/kchmviewer/%{name}-%{version}.tar.gz
-# Source0-md5:	6666e32415e0e91f963190a25d5767fb
+Source0:	http://downloads.sourceforge.net/kchmviewer/%{name}-%{version}.tar.gz
+# Source0-md5:	9798c7f949d1137949e69a8c226415f9
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-i18n.patch
+Patch2:		%{name}-missed_src.patch
+Patch3:		%{name}-no_msits.patch
 URL:		http://kchmviewer.sourceforge.net/
-BuildRequires:	autoconf >= 2.50
-BuildRequires:	automake >= 1.4
 BuildRequires:	chmlib-devel >= 0.37
-%{?with_kde:BuildRequires:	kdelibs-devel >= 9:3.0}
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
 BuildRequires:	libstdc++-devel
-BuildRequires:	libtool
-BuildRequires:	qt-devel
 BuildRequires:	zlib-devel
+Requires:	kio_msits
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -42,25 +35,17 @@
 wsparciem dla KDE, włącznie z widgetami KDE i KIO/KHTML.
 
 %prep
-%setup -q
+%setup -q -n build-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%{__perl} am_edit
-%configure \
-%if "%{_lib}" == "lib64"
-	--enable-libsuffix=64 \
-%endif
-	--%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
-	%{?with_kde:--with-kde} \
-	%{!?with_arts:--without-arts} \
-	--with-qt-libraries=%{_libdir}
+%cmake \
+	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
+	-DCMAKE_BUILD_TYPE=%{!?debug:release}%{?debug:debug} \
+	.
 %{__make}
 
 %install
@@ -69,10 +54,7 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install -D lib/kio-msits/kchmviewer.desktop $RPM_BUILD_ROOT%{_desktopdir}/kde/kchmviewer.desktop
-install -D src/pics/cr48-app-kchmviewer.png $RPM_BUILD_ROOT%{_pixmapsdir}/kchmviewer.png
-
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{du,nl}
+install -D packages/kchmviewer.png $RPM_BUILD_ROOT%{_pixmapsdir}/kchmviewer.png
 
 %find_lang %{name} --with-kde
 
@@ -83,7 +65,7 @@
 %defattr(644,root,root,755)
 %doc ChangeLog FAQ README
 %attr(755,root,root) %{_bindir}/*
-%{_desktopdir}/kde/*.desktop
+%{_desktopdir}/kde4/*.desktop
 %{_pixmapsdir}/*.png
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -92,6 +74,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22.2.1  2010/06/13 16:45:09  arvenil
+- up to 5.2
+- added patch for missing sources
+- added patch for using the version of kio_msits.so provided by kdegraphics
+  to avoid conflicts between packages
+- kchmviewer uses now qt4 and kde4
+
 Revision 1.22  2007/06/17 08:00:31  qboosh
 - fix Dutch locale name
 

================================================================
Index: packages/kchmviewer/kchmviewer-no_msits.patch
diff -u /dev/null packages/kchmviewer/kchmviewer-no_msits.patch:1.1
--- /dev/null	Sun Jun 13 18:45:15 2010
+++ packages/kchmviewer/kchmviewer-no_msits.patch	Sun Jun 13 18:45:09 2010
@@ -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 )

================================================================
Index: packages/kchmviewer/kchmviewer-missed_src.patch
diff -u /dev/null packages/kchmviewer/kchmviewer-missed_src.patch:1.1
--- /dev/null	Sun Jun 13 18:45:15 2010
+++ packages/kchmviewer/kchmviewer-missed_src.patch	Sun Jun 13 18:45:09 2010
@@ -0,0 +1,19 @@
+--- build-5.2/src/CMakeLists.txt	2009-12-15 14:27:57.000000000 +0800
++++ build-5.2.new/src/CMakeLists.txt	2010-04-28 14:37:16.004826978 +0800
+@@ -19,6 +19,8 @@
+ 	tab_index.cpp
+ 	tab_search.cpp
+ 	treeviewitem.cpp
++	toolbarmanager.cpp
++	toolbareditor.cpp
+ 	viewwindow.cpp
+ 	viewwindowmgr.cpp
+ 	viewwindow_qtextbrowser.cpp
+@@ -36,6 +38,7 @@
+ 	tab_contents.ui
+ 	tab_index.ui
+ 	tab_search.ui
++	toolbareditor.ui
+ 	window_browser.ui
+    )
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kchmviewer/kchmviewer.spec?r1=1.22&r2=1.22.2.1&f=u