rpms/chmsee/devel chmsee-1.0.0-xulrunner-1.9.patch, NONE, 1.1 chmsee.spec, 1.23, 1.24

[Yuan Yijun (bbbush)]

Author: bbbush

Update of /cvs/extras/rpms/chmsee/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11670

Modified Files:
	chmsee.spec 
Added Files:
	chmsee-1.0.0-xulrunner-1.9.patch 
Log Message:
patch from Martin Stransky to fix crash on open files (rh#427622)

chmsee-1.0.0-xulrunner-1.9.patch:

--- NEW FILE chmsee-1.0.0-xulrunner-1.9.patch ---
diff -up chmsee-1.0.0/configure.xul chmsee-1.0.0/configure
--- chmsee-1.0.0/configure.xul	2007-07-11 08:06:17.000000000 +0200
+++ chmsee-1.0.0/configure	2008-04-24 18:20:15.000000000 +0200
@@ -20680,7 +20684,7 @@ if test "x$enbale_gecko" = "xyes" ; then
 
    GECKO_INCLUDE_ROOT=`$PKG_CONFIG --cflags-only-I $gecko_provider-gtkmozembed | awk '{print $1}' | sed "s/^-I//"`
    GECKO_INCLUDE_ROOT=`dirname $GECKO_INCLUDE_ROOT`
-   GECKO_LIB_ROOT=`$PKG_CONFIG --libs-only-L $gecko_provider-gtkmozembed | awk '{print $1}' |  cut -c 3-`
+   GECKO_LIB_ROOT=`$PKG_CONFIG --variable=libdir $gecko_provider-gtkmozembed`
    GECKO_FLAVOUR=$gecko_provider
 
    GECKO_CFLAGS="$GECKO_CFLAGS \


Index: chmsee.spec
===================================================================
RCS file: /cvs/extras/rpms/chmsee/devel/chmsee.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- chmsee.spec	22 Feb 2008 15:47:44 -0000	1.23
+++ chmsee.spec	25 Apr 2008 00:53:26 -0000	1.24
@@ -1,6 +1,6 @@
 Name:		chmsee
 Version:	1.0.0
-Release:	2.36%{?dist}
+Release:	2.37%{?dist}
 Summary(zh_CN):	CHM 文件阅读工具, 基于 Gtk2+
 Summary:	A Gtk+2 CHM document viewer
 Group:		Applications/Publishing
@@ -10,6 +10,7 @@
 # this file comes from gnochm package
 Source1:	gnochm-chmfile.png
 Patch1:		chmsee-1.0.0-desktop-icon.patch
+Patch2:		chmsee-1.0.0-xulrunner-1.9.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	intltool >= 0.34 pkgconfig >= 0.9 gettext 
@@ -55,10 +56,11 @@
 %prep
 %setup -q 
 %patch1 -p1 -b .desktop-mimetype
+%patch2 -p1 -b .xulrunner-unstable
 
 %build
 %configure --disable-static 
-make %{?_smp_mflags} "CPPFLAGS=-DHAVE_GECKO_1_9"
+make %{?_smp_mflags} CPPFLAGS=-DHAVE_GECKO_1_9
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -106,6 +108,9 @@
 %{_datadir}/icons/hicolor/*/apps/chmsee.png
 
 %changelog
+* Fri Apr 25 2008 bbbush <bbbush.yuan at gmail.com> - 1.0.0-2.37
+- patch from Martin Stransky to fix crash on open files (rh#427622)
+
 * Fri Feb 22 2008 bbbush <bbbush.yuan at gmail.com> - 1.0.0-2.36
 - try build with gcc-43
 - xulrunner-gtkmozembed is in xulrunner-devel-unstable