rpms/chmsee/F-11 chmsee-1.0.6-disable-libxul-maxver.patch, 1.1, 1.2 chmsee.spec, 1.31, 1.32

[Yuan Yijun]

Author: bbbush

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

Modified Files:
	chmsee-1.0.6-disable-libxul-maxver.patch chmsee.spec 
Log Message:
chmsee: update libxul-maxver patch

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

Index: chmsee-1.0.6-disable-libxul-maxver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/chmsee/F-11/chmsee-1.0.6-disable-libxul-maxver.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- chmsee-1.0.6-disable-libxul-maxver.patch	13 Jul 2009 01:42:35 -0000	1.1
+++ chmsee-1.0.6-disable-libxul-maxver.patch	14 Jul 2009 13:22:45 -0000	1.2
@@ -1,13 +1,24 @@
-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)
+diff -up chmsee-1.0.6/CMakeLists.txt.libxul-maxver chmsee-1.0.6/CMakeLists.txt
+--- chmsee-1.0.6/CMakeLists.txt.libxul-maxver	2009-07-12 11:02:53.000000000 +0800
++++ chmsee-1.0.6/CMakeLists.txt	2009-07-14 21:18:46.082878896 +0800
+@@ -2,7 +2,7 @@ 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)
++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.1)
  
  set(CHMSEE_BOOKMARK_FILE "chmsee_bookmarks")
  set(CHMSEE_BOOKINFO_FILE "chmsee_bookinfo")
+diff -up chmsee-1.0.6/src/gecko_utils.cpp.libxul-maxver chmsee-1.0.6/src/gecko_utils.cpp
+--- chmsee-1.0.6/src/gecko_utils.cpp.libxul-maxver	2009-07-14 21:14:56.860644956 +0800
++++ chmsee-1.0.6/src/gecko_utils.cpp	2009-07-14 21:17:21.613628198 +0800
+@@ -207,7 +207,7 @@ gecko_utils_init(void)
+ 
+         static const GREVersionRange greVersion = {
+                 "1.9a", PR_TRUE,
+-                "1.9.1", PR_FALSE
++                "1.9.1", PR_TRUE
+         };
+ 
+         char xpcomLocation[4096];


Index: chmsee.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chmsee/F-11/chmsee.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- chmsee.spec	13 Jul 2009 01:42:35 -0000	1.31
+++ chmsee.spec	14 Jul 2009 13:22:45 -0000	1.32
@@ -57,7 +57,7 @@ only current file's.
 %patch0 -p1 -b .libxul-maxver
 
 %build
-%cmake .
+%cmake . -DGECKO_LIB_ROOT=`pkg-config --variable=libdir libxul`
 make VERBOSE=1 %{?_smp_mflags}
 
 %install