rpms/chmsee/F-11 chmsee-1.0.6-disable-libxul-maxver.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 chmsee.spec, 1.30, 1.31 sources, 1.5, 1.6 chmsee-1.0.1-desktop-icon.patch, 1.1, NONE chmsee-1.0.1-xulrunner-1.9.patch, 1.2, NONE

[Yuan Yijun]

Author: bbbush

Update of /cvs/pkgs/rpms/chmsee/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5347

Modified Files:
	.cvsignore chmsee.spec sources 
Added Files:
	chmsee-1.0.6-disable-libxul-maxver.patch 
Removed Files:
	chmsee-1.0.1-desktop-icon.patch 
	chmsee-1.0.1-xulrunner-1.9.patch 
Log Message:
chmsee: update to 1.0.6

chmsee-1.0.6-disable-libxul-maxver.patch:

--- NEW FILE chmsee-1.0.6-disable-libxul-maxver.patch ---
diff -up chmsee-1.0.6/CMakeLists.txt.orig chmsee-1.0.6/CMakeLists.txt
--- chmsee-1.0.6/CMakeLists.txt.orig	2009-07-12 23:06:05.403162880 +0800
+++ chmsee-1.0.6/CMakeLists.txt	2009-07-12 23:06:24.191893761 +0800
@@ -2,7 +2,8 @@ project(chmsee)
 cmake_minimum_required(VERSION 2.6.2 FATAL_ERROR)
 set(PACKAGE_VERSION "1.0.6" )
 find_package(PkgConfig)
-pkg_check_modules (CHMSEE REQUIRED gthread-2.0 glib-2.0 libxml-2.0 gtk+-2.0 libglade-2.0 libxul-embedding-unstable>=1.9 libxul-embedding-unstable<=1.9.0.999)
+pkg_check_modules (CHMSEE REQUIRED gthread-2.0 glib-2.0 libxml-2.0 gtk+-2.0
+libglade-2.0 libxul-embedding-unstable>=1.9)
 
 set(CHMSEE_BOOKMARK_FILE "chmsee_bookmarks")
 set(CHMSEE_BOOKINFO_FILE "chmsee_bookinfo")


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/chmsee/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	17 May 2008 10:59:57 -0000	1.5
+++ .cvsignore	13 Jul 2009 01:42:35 -0000	1.6
@@ -1 +1 @@
-chmsee-1.0.1.tar.gz
+chmsee-1.0.6.tar.gz


Index: chmsee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chmsee/F-11/chmsee.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- chmsee.spec	30 Jun 2009 18:53:23 -0000	1.30
+++ chmsee.spec	13 Jul 2009 01:42:35 -0000	1.31
@@ -1,19 +1,18 @@
 Name:		chmsee
-Version:	1.0.1
-Release:	7%{?dist}
+Version:	1.0.6
+Release:	1%{?dist}
 Summary(zh_CN):	CHM 文件阅读工具, 基于 Gtk2+
 Summary:	A Gtk+2 CHM document viewer
 Group:		Applications/Publishing
 License:	GPLv2
-URL:		http://chmsee.gro.clinux.org/
-Source0:	http://download.gro.clinux.org/%{name}/%{name}-%{version}.tar.gz
+URL:		http://code.google.com/p/chmsee
+Source0:	http://chmsee.googlecode.com/files/%{name}-%{version}.tar.gz
 # this file comes from gnochm package
 Source1:	gnochm-chmfile.png
-Patch1:		chmsee-1.0.1-desktop-icon.patch
-Patch2:		chmsee-1.0.1-xulrunner-1.9.patch
+Patch0:		chmsee-1.0.6-disable-libxul-maxver.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	intltool >= 0.34 pkgconfig >= 0.9 gettext 
+BuildRequires:	intltool >= 0.34 pkgconfig >= 0.9 gettext cmake
 BuildRequires:	gtk2-devel >= 2.8 libglade2-devel >= 2.0
 BuildRequires:	libgcrypt-devel chmlib-devel
 BuildRequires:	desktop-file-utils
@@ -54,18 +53,17 @@ only current file's.
 
 
 %prep
-%setup -q 
-%patch1 -p1 -b .desktop-mimetype
-%patch2 -p1 -b .xulrunner-1.9
+%setup -q
+%patch0 -p1 -b .libxul-maxver
 
 %build
-%configure --with-gecko=libxul
-make %{?_smp_mflags}
+%cmake .
+make VERBOSE=1 %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-install -p -m 644 -D chmsee-icon.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/chmsee.png
+install -p -m 644 -D data/chmsee-icon.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/chmsee-icon.png
 # this file comes from gnochm package. Take care and avoid conflict (cp -p).
 install -p -m 644 -D %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/icons/gnome/48x48/mimetypes/application-x-chm.png
 ln -s application-x-chm.png $RPM_BUILD_ROOT%{_datadir}/icons/gnome/48x48/mimetypes/gnome-mime-application-x-chm.png
@@ -96,18 +94,33 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc README* COPYING AUTHORS ChangeLog NEWS* TODO
+%doc AUTHORS ChangeLog* COPYING NEWS README
 %{_bindir}/chmsee
-%{_mandir}/man1/chmsee*.1*
-%{_datadir}/chmsee/
-%{_datadir}/pixmaps/chmsee-icon.png
 %{_datadir}/applications/*.desktop
-%{_datadir}/mime-info/chmsee.mime
-%{_datadir}/mime-info/chmsee.keys
+%{_datadir}/chmsee/
 %{_datadir}/icons/gnome/*/mimetypes/*.png
-%{_datadir}/icons/hicolor/*/apps/chmsee.png
+%{_datadir}/icons/hicolor/*/apps/chmsee-icon.png
+%{_datadir}/mime-info/chmsee.keys
+%{_datadir}/mime-info/chmsee.mime
+%{_datadir}/pixmaps/chmsee-icon.png
+#{_mandir}/man1/chmsee*.1*
 
 %changelog
+* Sun Jul 12 2009 bbbush <bbbush.yuan at gmail.com> - 1.0.6-1
+- update to 1.0.6
+- update project location. Chmsee moved to google code since 2009-01-05,
+  co-maintained by Li Daobing and Jungle Ji
+- update build steps to use CMake
+- Chmsee 1.0.3 was released on 2009-01-10, added "copy page location" in
+  context menu, updated translation
+- Chmsee 1.0.4 was released on 2009-03-14, added "drag and drop" support,
+  dropped cs2w
+- Chmsee 1.0.5 was released on 2009-05-17, added fullscreen support, switched
+  to CMake, supported 6 more new languages
+- Chmsee 1.0.6 was released on 2009-07-12, added index support, supported 8
+  more new languages
+
+
 * Tue Jun 30 2009 Christopher Aillon <caillon at redhat.com> - 1.0.1-7
 - Rebuild against newer gecko
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chmsee/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	17 May 2008 10:59:57 -0000	1.5
+++ sources	13 Jul 2009 01:42:35 -0000	1.6
@@ -1 +1 @@
-0ea3d439ab240f12bc0f35632bbe114d  chmsee-1.0.1.tar.gz
+7a42795038e138ee233952b525373b08  chmsee-1.0.6.tar.gz


--- chmsee-1.0.1-desktop-icon.patch DELETED ---


--- chmsee-1.0.1-xulrunner-1.9.patch DELETED ---