rpms/ruby-gnome2/F-10 ruby-gnome2-0.19.0-gtkmozembed.patch, NONE, 1.1 ruby-gnome2-0.19.0-panel-applet.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 ruby-gnome2.spec, 1.42, 1.43 sources, 1.6, 1.7 ruby-gnome2-all-0.16.0-xulrunner.patch, 1.3, NONE
Mamoru Tasaka
mtasaka at fedoraproject.org
Wed Jun 17 19:33:12 UTC 2009
Author: mtasaka
Update of /cvs/extras/rpms/ruby-gnome2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19485
Modified Files:
.cvsignore ruby-gnome2.spec sources
Added Files:
ruby-gnome2-0.19.0-gtkmozembed.patch
ruby-gnome2-0.19.0-panel-applet.patch
Removed Files:
ruby-gnome2-all-0.16.0-xulrunner.patch
Log Message:
sync with F-11/devel
ruby-gnome2-0.19.0-gtkmozembed.patch:
--- NEW FILE ruby-gnome2-0.19.0-gtkmozembed.patch ---
--- ruby-gnome2-all-0.19.0/gtkmozembed/extconf.rb.debug 2009-05-18 21:47:19.000000000 +0900
+++ ruby-gnome2-all-0.19.0/gtkmozembed/extconf.rb 2009-06-18 02:22:37.000000000 +0900
@@ -77,7 +77,7 @@
end
headers = include_paths.inject([]) do |result, path|
gtkmozembed_h = File.join(path, "gtkmozembed.h")
- result += [gtkmozembed_h] if gtkmozembed_h
+ result += [gtkmozembed_h] if FileTest.readable?(gtkmozembed_h)
result
end
glib_mkenums(enum_type_prefix, headers, "GTK_TYPE_", ["gtkmozembed.h"])
ruby-gnome2-0.19.0-panel-applet.patch:
--- NEW FILE ruby-gnome2-0.19.0-panel-applet.patch ---
--- ruby-gnome2-all-0.19.0/panel-applet/extconf.rb.debug2 2009-05-21 23:03:01.000000000 +0900
+++ ruby-gnome2-all-0.19.0/panel-applet/extconf.rb 2009-06-18 03:39:57.000000000 +0900
@@ -21,6 +21,8 @@
make_version_header("PANELAPPLET", PACKAGE_ID)
+$INSTALLFILES = []
+
create_makefile_at_srcdir(PACKAGE_NAME, BASE_DIR + "/src",
"-DRUBY_PANELAPPLET_COMPILATION")
$INSTALLFILES << ["../lib/**/*.rb", "$(RUBYLIBDIR)", "../lib"]
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore 14 Nov 2008 01:59:25 -0000 1.6
+++ .cvsignore 17 Jun 2009 19:32:42 -0000 1.7
@@ -1 +1 @@
-ruby-gnome2-all-0.18.1.tar.gz
+ruby-gnome2-all-0.19.0.tar.gz
Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-10/ruby-gnome2.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- ruby-gnome2.spec 12 Jun 2009 00:04:14 -0000 1.42
+++ ruby-gnome2.spec 17 Jun 2009 19:32:42 -0000 1.43
@@ -4,7 +4,7 @@
%define xulrunner_still_beta 1
%define betaver rc1
-%define mainrel 5
+%define mainrel 1
# Note
# Currently this spec file does not support libgda module.
@@ -12,8 +12,8 @@
# - Mamoru Tasaka
Name: ruby-gnome2
-Version: 0.18.1
-Release: %{mainrel}%{?dist}.3
+Version: 0.19.0
+Release: %{mainrel}%{?dist}
Summary: Ruby binding of libgnome/libgnomeui-2.x
Group: System Environment/Libraries
@@ -22,7 +22,8 @@ License: LGPLv2
URL: http://ruby-gnome2.sourceforge.jp/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-all-%{version}.tar.gz
Patch0: ruby-gnome2-0.17.0-rc1-script.patch
-Patch14: ruby-gnome2-all-0.16.0-xulrunner.patch
+Patch14: ruby-gnome2-0.19.0-gtkmozembed.patch
+Patch15: ruby-gnome2-0.19.0-panel-applet.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ruby ruby-devel gtk2-devel libgnome-devel libgnomeui-devel
@@ -304,26 +305,9 @@ Group: System Environment/Libra
BuildRequires: ruby ruby-devel gtk2-devel pango-devel
-%if 0%{?fedora} > 8
BuildRequires: gecko-devel >= 1.9
BuildRequires: gecko-devel-unstable >= 1.9
Requires: gecko-libs >= 1.9
-%endif
-
-%if 0%{?fedora} == 8
-BuildRequires: gecko-devel = 1.8.1.14
-Requires: gecko-libs = 1.8.1.14
-%endif
-
-%if 0%{?fedora} == 7
-BuildRequires: gecko-devel = 1.8.1.14
-Requires: gecko-libs = 1.8.1.14
-%endif
-
-%if 0%{?fedora} == 6
-BuildRequires: gecko-devel = 1.8.0.12
-Requires: gecko-libs = 1.8.0.12
-%endif
Requires: ruby(abi) = 1.8
Requires: ruby(gtk2) = %{version}-%{release}
@@ -515,9 +499,8 @@ Ruby/VTE is a Ruby binding of VTE.
%prep
%setup -q -n %{name}-all-%{version}
%patch0 -p1
-%if 0%{?fedora} >= 9
-%patch14 -p1 -b .xulrunner
-%endif
+%patch14 -p1 -b .moz
+%patch15 -p1 -b .panel
# Fix the attributes of some files
# suppress lots of messages..
@@ -531,13 +514,6 @@ set -x
ruby extconf.rb
export CFLAGS="$RPM_OPT_FLAGS"
-# Workaround
-## For gtkmozembed
-%if 0%{?fedora} >= 9 && 0%{?xulrunner_still_beta} >=1
-sed -i.betaver -e '/GTKMOZEMBED_MINOR_VERSION/s|(.*)|(9)|' \
- gtkmozembed/src/rbgtkmozembedversion.h
-%endif
-
make %{?_smp_mflags}
%install
@@ -647,6 +623,7 @@ rm -rf $RPM_BUILD_ROOT
%doc gtk/ChangeLog gtk/COPYING.LIB gtk/README gtk/sample
%attr(755, root, root) %{ruby_sitelib}/gtk2.rb
#%{ruby_sitelib}/gtk2.rb
+%dir %{ruby_sitelib}/gtk2
%attr(755, root, root) %{ruby_sitelib}/gtk2/base.rb
#%{ruby_sitelib}/gtk2/base.rb
%{ruby_sitearch}/gtk2.so
@@ -708,7 +685,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%doc panel-applet/ChangeLog panel-applet/COPYING.LIB panel-applet/README panel-applet/sample
%{ruby_sitelib}/panelapplet2.rb
-%{ruby_sitearch}/panelapplet2.so
+%{ruby_sitearch}/panelapplet2*.so
%files -n ruby-pango
%defattr(-,root,root,-)
@@ -741,6 +718,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Jun 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.19.0-1
+- Update to 0.19.0
+
* Thu Jun 11 2009 Christopher Aillon <caillon at redhat.com> - 0.18.1-5.3
- Rebuild against newer gecko
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources 14 Nov 2008 01:59:25 -0000 1.6
+++ sources 17 Jun 2009 19:32:42 -0000 1.7
@@ -1 +1 @@
-7b312986a9098cbfa180b3ae46cee063 ruby-gnome2-all-0.18.1.tar.gz
+e293cf3e07f1d4e5da0020e45bea053e ruby-gnome2-all-0.19.0.tar.gz
--- ruby-gnome2-all-0.16.0-xulrunner.patch DELETED ---
More information about the fedora-extras-commits
mailing list