rpms/chmsee/F-11 chmsee-1.0.1-desktop-icon.patch, 1.2, 1.3 chmsee-1.0.1-xulrunner-1.9.patch, 1.3, 1.4 chmsee.spec, 1.33, 1.34 sources, 1.6, 1.7

Tue Jul 14 14:13:55 UTC 2009

Author: bbbush

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

Modified Files:
	chmsee.spec sources 
Added Files:
	chmsee-1.0.1-desktop-icon.patch 
	chmsee-1.0.1-xulrunner-1.9.patch 
Log Message:
chmsee: revert to 1.0.1 because latest version does not support xulrunner-1.9.1

chmsee-1.0.1-desktop-icon.patch:

Index: chmsee-1.0.1-desktop-icon.patch
===================================================================
RCS file: chmsee-1.0.1-desktop-icon.patch
diff -N chmsee-1.0.1-desktop-icon.patch

--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ chmsee-1.0.1-desktop-icon.patch	14 Jul 2009 14:13:54 -0000	1.3
@@ -0,0 +1,18 @@
+diff -up chmsee-1.0.0-beta2/chmsee.desktop.in.orig chmsee-1.0.0-beta2/chmsee.desktop.in
+--- chmsee-1.0.0-beta2/chmsee.desktop.in.orig	2007-04-06 17:01:16.000000000 +0800
++++ chmsee-1.0.0-beta2/chmsee.desktop.in	2007-07-21 10:22:44.000000000 +0800
+@@ -1,12 +1,12 @@
+ [Desktop Entry]
+-Version=1.0.1
++Version=1.0
+ Encoding=UTF-8
+ _Name=ChmSee
+ _Comment=HTML Help(CHM) viewer
+ Exec=chmsee %f
+ Terminal=false
+ Type=Application
+-Icon=chmsee-icon.png
++Icon=chmsee
+ StartupNotify=true
+ Categories=Utility;
+ MimeType=application/x-chm;

chmsee-1.0.1-xulrunner-1.9.patch:

Index: chmsee-1.0.1-xulrunner-1.9.patch
===================================================================
RCS file: chmsee-1.0.1-xulrunner-1.9.patch
diff -N chmsee-1.0.1-xulrunner-1.9.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ chmsee-1.0.1-xulrunner-1.9.patch	14 Jul 2009 14:13:55 -0000	1.4
@@ -0,0 +1,30 @@
+diff -up chmsee-1.0.1/configure.xulrunner-1.9 chmsee-1.0.1/configure
+--- chmsee-1.0.1/configure.xulrunner-1.9	2008-05-17 16:42:35.000000000 +0800
++++ chmsee-1.0.1/configure	2008-06-01 15:44:48.000000000 +0800
+@@ -5835,7 +5835,7 @@ if test -n "$GECKO_CFLAGS"; then
+   ac_status=$?
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_GECKO_CFLAGS=`$PKG_CONFIG --cflags "$gecko_provider" 2>/dev/null`
++  pkg_cv_GECKO_CFLAGS=`$PKG_CONFIG --cflags "$gecko_provider" --cflags nspr 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -5851,7 +5851,7 @@ if test -n "$GECKO_LIBS"; then
+   ac_status=$?
+   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_GECKO_LIBS=`$PKG_CONFIG --libs "$gecko_provider" 2>/dev/null`
++  pkg_cv_GECKO_LIBS=`$PKG_CONFIG --libs "$gecko_provider" --libs nspr 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -5901,7 +5901,7 @@ fi
+ if test "x$enable_gecko" != "xno" ; then
+ 
+     GECKO_INCLUDE_ROOT=`$PKG_CONFIG --cflags-only-I $gecko_provider | awk '{print $1}' | sed "s/^-I//"`
+-    GECKO_LIB_ROOT=`$PKG_CONFIG --libs-only-L $gecko_provider | awk '{print $1}' |  cut -c 3-`
++    GECKO_LIB_ROOT=`$PKG_CONFIG --variable=libdir $gecko_provider-gtkmozembed`
+     GECKO_INCLUDE_ROOT=`dirname $GECKO_INCLUDE_ROOT`
+     GECKO_FLAVOUR=$with_gecko
+ 


Index: chmsee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chmsee/F-11/chmsee.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- chmsee.spec	14 Jul 2009 13:23:57 -0000	1.33
+++ chmsee.spec	14 Jul 2009 14:13:55 -0000	1.34
@@ -1,6 +1,6 @@
 Name:		chmsee
-Version:	1.0.6
-Release:	1%{?dist}
+Version:	1.0.1
+Release:	8%{?dist}
 Summary(zh_CN):	CHM æ–‡ä»¶é˜…è¯»å·¥å…·, åŸºäºŽ Gtk2+
 Summary:	A Gtk+2 CHM document viewer
 Group:		Applications/Publishing
@@ -9,7 +9,8 @@ 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
-Patch0:		chmsee-1.0.6-disable-libxul-maxver.patch
+Patch1:		chmsee-1.0.1-desktop-icon.patch
+Patch2:		chmsee-1.0.1-xulrunner-1.9.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	intltool >= 0.34 pkgconfig >= 0.9 gettext cmake
@@ -54,16 +55,17 @@ only current file's.
 
 %prep
 %setup -q
-%patch0 -p1 -b .libxul-maxver
+%patch1 -p1 -b .desktop-mimetype
+%patch2 -p1 -b .xulrunner-1.9
 
 %build
-%cmake .
+%configure --with-gecko=libxul
 make VERBOSE=1 %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-install -p -m 644 -D data/chmsee-icon.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/chmsee-icon.png
+install -p -m 644 -D chmsee-icon.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/chmsee.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
@@ -94,18 +96,21 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog* COPYING NEWS README
+%doc README* COPYING AUTHORS ChangeLog NEWS* TODO
 %{_bindir}/chmsee
-%{_datadir}/applications/*.desktop
+%{_mandir}/man1/chmsee*.1*
 %{_datadir}/chmsee/
-%{_datadir}/icons/gnome/*/mimetypes/*.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*
+%{_datadir}/applications/*.desktop
+%{_datadir}/mime-info/chmsee.mime
+%{_datadir}/mime-info/chmsee.keys
+%{_datadir}/icons/gnome/*/mimetypes/*.png
+%{_datadir}/icons/hicolor/*/apps/chmsee.png
 
 %changelog
+* Tue Jul 14 2009 bbbush <bbbush.yuan at gmail.com> - 1.0.1-8
+- revert to 1.0.1 as latest version crash on xulrunner-1.9.1
+
 * 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,


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/chmsee/F-11/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	13 Jul 2009 01:42:35 -0000	1.6
+++ sources	14 Jul 2009 14:13:55 -0000	1.7
@@ -1 +1 @@
-7a42795038e138ee233952b525373b08  chmsee-1.0.6.tar.gz
+0ea3d439ab240f12bc0f35632bbe114d  chmsee-1.0.1.tar.gz


