rpms/ruby-gnome2/devel ruby-gnome2-0.19.3-xul192.patch, NONE, 1.1 ruby-gnome2.spec, 1.51, 1.52

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/ruby-gnome2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3454

Modified Files:
	ruby-gnome2.spec 
Added Files:
	ruby-gnome2-0.19.3-xul192.patch 
Log Message:
* Fri Nov 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.3-5
- Patch to compile with xulrunner 1.9.2


ruby-gnome2-0.19.3-xul192.patch:
 extconf.rb |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE ruby-gnome2-0.19.3-xul192.patch ---
--- ruby-gnome2-all-0.19.3/gtkmozembed/extconf.rb.xul	2009-09-23 09:43:01.000000000 +0900
+++ ruby-gnome2-all-0.19.3/gtkmozembed/extconf.rb	2009-11-20 05:10:04.000000000 +0900
@@ -4,6 +4,7 @@
 
 PACKAGE_NAME = "gtkmozembed"
 PACKAGE_IDS = ["libxul-embedding-unstable",
+               "libxul-embedding",
                "xulrunner-gtkmozembed",
                "firefox-gtkmozembed",
                "seamonkey-gtkmozembed",
@@ -20,8 +21,14 @@
 package_id = nil
 PACKAGE_IDS.each do |v|
   if PKGConfig.exist?(v)
+    if v == 'libxul-embedding'
+      if !PKGConfig.have_package(v, 1, 9, 2)
+        next
+      end
+    end
     package_id = v
     $stderr.puts "#{v} is found."
+    package_id.gsub!(/ .*/ , '')
     break
   else
     $stderr.puts "#{v} is not found."


Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/devel/ruby-gnome2.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- ruby-gnome2.spec	7 Nov 2009 04:04:55 -0000	1.51
+++ ruby-gnome2.spec	19 Nov 2009 20:41:19 -0000	1.52
@@ -8,7 +8,7 @@
 # When changing release number, please make it sure that
 # the new EVR won't be higher than the one of higher branch!!
 #
-%define         mainrel                4
+%define         mainrel                5
 
 # Note
 # Currently this spec file does not support libgda module.
@@ -37,6 +37,8 @@ Patch0:         ruby-gnome2-0.17.0-rc1-s
 # Fix crash when moving curson on fantasdic 1.0 beta 7 
 # (ruby-gnome2-Bugs-2865895)
 Patch10:        ruby-gnome2-0.19.3-crash-moving-cursor-bz2865895.patch
+# Must contact upstream
+Patch11:	ruby-gnome2-0.19.3-xul192.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -772,6 +774,7 @@ This package provides libraries and head
 #%%setup -q -n %{name}-all-%{version}-%{betaver}
 %patch0 -p1
 %patch10 -p0
+%patch11 -p1
 
 # Keep timestamps as much as possible
 find . -type f -name depend | xargs sed -i -e 's|-m 0644 -v|-m 0644 -p -v|'
@@ -1097,6 +1100,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Nov 20 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.3-5
+- Patch to compile with xulrunner 1.9.2
+
 * Sat Nov  7 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
 - release++