rpms/ruby-gnome2/F-9 ruby-gnome2-0.17.0-rc1-script.patch, NONE, 1.1 ruby-gnome2.spec, 1.25, 1.26 ruby-gnome2-all-0.16.0-glib-2.14.patch, 1.1, NONE ruby-gnome2-all-0.16.0-gtk-security.patch, 1.1, NONE ruby-gnome2-all-0.16.0-libglade2.patch, 1.1, NONE ruby-gnome2-all-0.16.0-newpoppler.patch, 1.3, NONE ruby-gnome2-all-0.16.0-typedef.patch, 1.1, NONE ruby-gnome2-script.patch, 1.1, NONE
Mamoru Tasaka (mtasaka)
fedora-extras-commits at redhat.com
Mon Jun 9 13:04:09 UTC 2008
- Previous message (by thread): rpms/taskjuggler/devel taskjuggler-2.4.1-no-kdepim3.patch, NONE, 1.1 taskjuggler.spec, 1.21, 1.22
- Next message (by thread): rpms/rubygem-activeldap/devel .cvsignore, 1.2, 1.3 rubygem-activeldap.spec, 1.2, 1.3 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mtasaka
Update of /cvs/extras/rpms/ruby-gnome2/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28346
Modified Files:
ruby-gnome2.spec
Added Files:
ruby-gnome2-0.17.0-rc1-script.patch
Removed Files:
ruby-gnome2-all-0.16.0-glib-2.14.patch
ruby-gnome2-all-0.16.0-gtk-security.patch
ruby-gnome2-all-0.16.0-libglade2.patch
ruby-gnome2-all-0.16.0-newpoppler.patch
ruby-gnome2-all-0.16.0-typedef.patch ruby-gnome2-script.patch
Log Message:
* Sun Jun 8 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.17.0-0.1.rc1
- 0.17.0 rc1
- Remove upstreamed patches - 2 patches remain
- ruby-gnome2-0.17.0-rc1-script.patch
- ruby-gnome2-all-0.16.0-xulrunner.patch
- Restrict ruby abi dependency to exact 1.8 version
- Fix the license (to strict LGPLv2)
ruby-gnome2-0.17.0-rc1-script.patch:
--- NEW FILE ruby-gnome2-0.17.0-rc1-script.patch ---
--- ruby-gnome2-0.17.0-rc1/glib/sample/utils.rb.local 2008-06-06 23:03:39.000000000 +0900
+++ ruby-gnome2-0.17.0-rc1/glib/sample/utils.rb 2008-06-08 23:42:10.000000000 +0900
@@ -32,7 +32,7 @@
puts "GLib.tmp_dir = #{GLib.tmp_dir}"
puts "GLib.current_dir = #{GLib.current_dir}"
puts "GLib.path_is_absolute?('./') = #{GLib.path_is_absolute?("./")}"
-puts "GLib.path_skip_root('/usr/local/bin/ruby') = #{GLib.path_skip_root('/usr/local/bin/ruby')}"
+puts "GLib.path_skip_root('/usr/bin/ruby') = #{GLib.path_skip_root('/usr/bin/ruby')}"
puts "GLib.path_get_basename(GLib.home_dir) = #{GLib.path_get_basename(GLib.home_dir)}"
puts "GLib.path_get_dirname(GLib.home_dir) = #{GLib.path_get_dirname(GLib.home_dir)}"
puts "GLib.find_program_in_path(GLib.prgname) = #{GLib.find_program_in_path(GLib.prgname)}"
--- ruby-gnome2-0.17.0-rc1/gtk/sample/misc/button2.rb.local 2008-06-06 23:03:42.000000000 +0900
+++ ruby-gnome2-0.17.0-rc1/gtk/sample/misc/button2.rb 2008-06-08 23:41:26.000000000 +0900
@@ -1,4 +1,4 @@
-#!/usr/local/bin/ruby
+#!/usr/bin/ruby
=begin
button2.rb - Ruby/GTK2 sample script.
--- ruby-gnome2-0.17.0-rc1/pango/sample/layout.rb.local 2008-06-06 23:03:45.000000000 +0900
+++ ruby-gnome2-0.17.0-rc1/pango/sample/layout.rb 2008-06-08 23:41:26.000000000 +0900
@@ -1,4 +1,4 @@
-#!/usr/local/bin/ruby
+#!/usr/bin/ruby
=begin
layout.rb - Ruby/Pango sample script.
Index: ruby-gnome2.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-gnome2/F-9/ruby-gnome2.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ruby-gnome2.spec 20 Mar 2008 06:12:49 -0000 1.25
+++ ruby-gnome2.spec 9 Jun 2008 13:03:24 -0000 1.26
@@ -1,30 +1,32 @@
%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
-%define xulrunner_still_beta 1
+%define xulrunner_still_beta 1
+%define betaver rc1
+
+# Note
+# Currently this spec file does not support libgda module.
+# libgda-2 is needed, API change for libgda-3 needs investigation
+# - Mamoru Tasaka
Name: ruby-gnome2
-Version: 0.16.0
-Release: 28%{?dist}
+Version: 0.17.0
+Release: 0.1.%{betaver}%{?dist}
Summary: Ruby binding of libgnome/libgnomeui-2.x
Group: System Environment/Libraries
-License: LGPLv2+
+License: LGPLv2
URL: http://ruby-gnome2.sourceforge.jp/
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-all-%{version}.tar.gz
-Patch0: ruby-gnome2-script.patch
-Patch10: ruby-gnome2-all-0.16.0-typedef.patch
-Patch11: ruby-gnome2-all-0.16.0-newpoppler.patch
-Patch12: ruby-gnome2-all-0.16.0-glib-2.14.patch
-Patch13: ruby-gnome2-all-0.16.0-gtk-security.patch
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?betaver:-%betaver}.tar.gz
+Patch0: ruby-gnome2-0.17.0-rc1-script.patch
Patch14: ruby-gnome2-all-0.16.0-xulrunner.patch
-Patch15: ruby-gnome2-all-0.16.0-libglade2.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ruby ruby-devel gtk2-devel libgnome-devel libgnomeui-devel
+BuildRequires: ruby(abi) = 1.8
-Requires: ruby(abi) >= 1.8
+Requires: ruby(abi) = 1.8
Requires: ruby(gnomecanvas2) = %{version}-%{release}
Provides: ruby(gnome2) = %{version}-%{release}
@@ -40,7 +42,7 @@
BuildRequires: ruby ruby-devel glib2-devel atk-devel
#BuildRequires: ruby(glib2-devel) = %{version}
-Requires: ruby(abi) >= 1.8 ruby(glib2) = %{version}-%{release}
+Requires: ruby(abi) = 1.8 ruby(glib2) = %{version}-%{release}
Provides: ruby(atk) = %{version}-%{release}
@@ -61,13 +63,41 @@
Ruby/ATK is a Ruby binding of ATK-1.0.x or later.
This package provides libraries and header files for ruby-atk
+%package -n ruby-bonobo2
+Summary: Ruby binding of libbonobo-2.x
+Group: System Environment/Libraries
+
+BuildRequires: ruby ruby-devel
+BuildRequires: libbonoboui-devel
+
+Requires: ruby(abi) = 1.8 ruby(gtk2) = %{version}-%{release}
+
+Provides: ruby(bonobo2) = %{version}-%{release}
+
+%description -n ruby-bonobo2
+Ruby/Bonobo2 is a Ruby binding of libbonobo-2.x.
+
+%package -n ruby-bonoboui2
+Summary: Ruby binding of libbonoboui-2.x
+Group: System Environment/Libraries
+
+BuildRequires: ruby ruby-devel
+BuildRequires: libbonoboui-devel libgnomeui-devel
+
+Requires: ruby(abi) = 1.8 ruby(gnome2) = %{version}-%{release}
+
+Provides: ruby(bonoboui2) = %{version}-%{release}
+
+%description -n ruby-bonoboui2
+Ruby/BonoboUI2 is a Ruby binding of libbonoboui-2.x.
+
%package -n ruby-gconf2
Summary: Ruby binding of GConf-1.2.x
Group: System Environment/Libraries
BuildRequires: ruby ruby-devel GConf2-devel
-Requires: ruby(abi) >= 1.8 ruby(glib2) = %{version}-%{release}
+Requires: ruby(abi) = 1.8 ruby(glib2) = %{version}-%{release}
Provides: ruby(gconf2) = %{version}-%{release}
@@ -81,7 +111,7 @@
BuildRequires: ruby ruby-devel gtk2-devel ruby-cairo-devel
#BuildRequires: ruby(glib2-devel) = %{version} ruby(gtk2-devel) = %{version}
-Requires: ruby(abi) >= 1.8
+Requires: ruby(abi) = 1.8
Requires: ruby(glib2) = %{version}-%{release} ruby(cairo)
Provides: ruby(gdkpixbuf2) = %{version}-%{release}
@@ -95,7 +125,7 @@
BuildRequires: ruby ruby-devel glib2-devel
-Requires: ruby(abi) >= 1.8
+Requires: ruby(abi) = 1.8
Provides: ruby(glib2) = %{version}-%{release}
@@ -121,7 +151,7 @@
BuildRequires: ruby ruby-devel gtk2-devel libgnomecanvas-devel
-Requires: ruby(abi) >= 1.8
+Requires: ruby(abi) = 1.8
Requires: ruby(gtk2) = %{version}-%{release}
Requires: ruby(libart2) = %{version}-%{release}
@@ -138,7 +168,7 @@
#BuildRequires: ruby(glib2-devel) = %{version} ruby(pango-devel) = %{version}
#BuildRequires: ruby(libart2-devel) = %{version}
-Requires: ruby(abi) >= 1.8
+Requires: ruby(abi) = 1.8
Requires: ruby(glib2) = %{version}-%{release} ruby(pango) = %{version}-%{release}
Requires: ruby(libart2) = %{version}-%{release}
@@ -154,7 +184,7 @@
BuildRequires: ruby ruby-devel libgnomeprintui22-devel
#BuildRequires: ruby(gtk2-devel) = %{version}
-Requires: ruby(abi) >= 1.8
+Requires: ruby(abi) = 1.8
Requires: ruby(gtk2) = %{version}-%{release} ruby(gnomeprint2) = %{version}-%{release}
Provides: ruby(gnomeprintui2) = %{version}-%{release}
@@ -168,7 +198,7 @@
BuildRequires: ruby ruby-devel gnome-vfs2-devel
-Requires: ruby(abi) >= 1.8
+Requires: ruby(abi) = 1.8
Requires: ruby(glib2) = %{version}-%{release}
Provides: ruby(gnomevfs) = %{version}-%{release}
@@ -176,6 +206,21 @@
%description -n ruby-gnomevfs
Ruby/GnomeVFS is a Ruby binding of GnomeVFS-2.0.x.
+%package -n ruby-gstreamer
+Summary: Ruby binding of GStreamer
+Group: System Environment/Libraries
+
+BuildRequires: ruby ruby-devel
+BuildRequires: gstreamer-devel gstreamer-plugins-base-devel
+
+Requires: ruby(abi) = 1.8
+Requires: ruby(glib2) = %{version}-%{release}
+
+Provides: ruby(gstreamer) = %{version}-%{release}
+
+%description -n ruby-gstreamer
+Ruby/GStreamer is a Ruby binding for GStreamer
+
%package -n ruby-gtk2
Summary: Ruby binding of GTK+-2.0.x
Group: System Environment/Libraries
@@ -184,7 +229,7 @@
#BuildRequires: ruby(glib2-devel) = %{version} ruby(pango-devel) = %{version}
Requires: %{_bindir}/env
-Requires: ruby(abi) >= 1.8
+Requires: ruby(abi) = 1.8
Requires: ruby(glib2) = %{version}-%{release} ruby(atk) = %{version}-%{release}
Requires: ruby(pango) = %{version}-%{release} ruby(cairo)
Requires: ruby(gdkpixbuf2) = %{version}-%{release}
@@ -214,7 +259,7 @@
BuildRequires: ruby ruby-devel gtk2-devel gtkglext-devel
#BuildRequires: ruby(glib2-devel) = %{version} ruby(gtk2-devel) = %{version}
-Requires: ruby(abi) >= 1.8
+Requires: ruby(abi) = 1.8
#Requires: OpenGL SEE README file for this
Requires: ruby(gtk2) = %{version}-%{release}
@@ -229,7 +274,7 @@
BuildRequires: ruby ruby-devel gtk2-devel gtkhtml2-devel
-Requires: ruby(abi) >= 1.8
+Requires: ruby(abi) = 1.8
Requires: ruby(gtk2) = %{version}-%{release}
Provides: ruby(gtkhtml2) = %{version}-%{release}
@@ -243,28 +288,28 @@
BuildRequires: ruby ruby-devel gtk2-devel pango-devel
-%if "%fedora" > "8"
+%if 0%{?fedora} > 8
BuildRequires: gecko-devel = 1.9
BuildRequires: gecko-devel-unstable = 1.9
Requires: gecko-libs = 1.9
%endif
-%if "%fedora" == "8"
-BuildRequires: gecko-devel = 1.8.1.12
-Requires: gecko-libs = 1.8.1.12
+%if 0%{?fedora} == 8
+BuildRequires: gecko-devel = 1.8.1.14
+Requires: gecko-libs = 1.8.1.14
%endif
-%if "%fedora" == "7"
-BuildRequires: gecko-devel = 1.8.1.12
-Requires: gecko-libs = 1.8.1.12
+%if 0%{?fedora} == 7
+BuildRequires: gecko-devel = 1.8.1.14
+Requires: gecko-libs = 1.8.1.14
%endif
-%if "%fedora" == "6"
+%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(abi) = 1.8
Requires: ruby(gtk2) = %{version}-%{release}
Provides: ruby(gtkmozembed) = %{version}-%{release}
@@ -280,7 +325,7 @@
BuildRequires: ruby ruby-devel gtksourceview-devel
#BuildRequires: ruby(gnome2) = %{version}
-Requires: ruby(abi) >= 1.8
+Requires: ruby(abi) = 1.8
Requires: ruby(gtk2) = %{version}-%{release}
Provides: ruby(gtksourceview) = %{version}-%{release}
@@ -295,7 +340,7 @@
BuildRequires: ruby ruby-devel libart_lgpl-devel libpng-devel libjpeg-devel
#BuildRequires: ruby(glib2-devel) = %{version}
-Requires: ruby(abi) >= 1.8
+Requires: ruby(abi) = 1.8
Provides: ruby(libart2) = %{version}-%{release}
@@ -323,7 +368,7 @@
BuildRequires: ruby ruby-devel gtk2-devel libgnome-devel libglade2-devel
#BuildRequires: ruby(glib2-devel) = %{version} ruby(gnome2) = %{version}
-Requires: ruby(abi) >= 1.8
+Requires: ruby(abi) = 1.8
Requires: ruby(gtk2) = %{version}-%{release}
Requires: ruby(gnome2) = %{version}-%{release}
@@ -344,7 +389,7 @@
Requires: %{_bindir}/env
Requires: %{_bindir}/ruby
-Requires: ruby(abi) >= 1.8
+Requires: ruby(abi) = 1.8
Requires: ruby(gnome2) = %{version}-%{release}
Provides: ruby(panelapplet2) = %{version}-%{release}
@@ -359,7 +404,7 @@
BuildRequires: ruby ruby-devel glib2-devel pango-devel cairo-devel ruby-cairo-devel
#BuildRequires: ruby(glib2-devel) = %{version}
-Requires: ruby(abi) >= 1.8
+Requires: ruby(abi) = 1.8
Requires: ruby(glib2) = %{version}-%{release} ruby(cairo)
Provides: ruby(pango) = %{version}-%{release}
@@ -392,7 +437,7 @@
#BuildRequires: ruby(glib2-devel) = %{version} ruby(gdkpixbuf2) = %{version}
Requires: %{_bindir}/env
-Requires: ruby(abi) >= 1.8
+Requires: ruby(abi) = 1.8
Requires: ruby(gdkpixbuf2) = %{version}-%{release}
Requires: ruby(gtk2) = %{version}-%{release} ruby(cairo)
@@ -410,7 +455,7 @@
#BuildRequires: ruby(glib2-devel) = %{version} ruby(gdkpixbuf2) = %{version}
Requires: %{_bindir}/env
-Requires: ruby(abi) >= 1.8
+Requires: ruby(abi) = 1.8
Requires: ruby(gdkpixbuf2) = %{version}-%{release}
Requires: ruby(cairo)
@@ -427,7 +472,7 @@
#BuildRequires: ruby(gtk2-devel) = %{version}
Requires: %{_bindir}/env
-Requires: ruby(abi) >= 1.8
+Requires: ruby(abi) = 1.8
Requires: ruby(gtk2) = %{version}-%{release}
Provides: ruby(vte) = %{version}-%{release}
@@ -437,36 +482,19 @@
%prep
-%setup -q -n %{name}-all-%{version}
+%setup -q -n %{name}-%{version}%{?betaver:-%betaver}
%patch0 -p1
-%patch10 -p1 -b .typedef
-%patch11 -p1 -b .newpoppler
-%patch12 -p1 -b .glib2_14
-%patch13 -p1 -b .security
%if 0%{?fedora} >= 9
%patch14 -p1 -b .xulrunner
%endif
-%patch15 -p1 -b .fixmethod
-
-#Because of an error in upstream packaging there is a second ruby-gnome2 dir inside so we delete it
-#%{__rm} -rf %{name}
# Fix the attributes of some files
-
-%{__chmod} 644 glib/sample/*.rb
-%{__chmod} 644 glib/src/*.c
-%{__chmod} 644 gtk/sample/misc/properties.rb
-%{__chmod} 644 gtk/sample/misc/assistant.rb
-%{__chmod} 644 gtk/sample/gtk-demo/main.rb
-%{__chmod} 644 gtk/sample/misc/cairo-pong.rb
-%{__chmod} 644 gtk/sample/misc/style_property.rb
-%{__chmod} 644 panel-applet/sample/clock-applet.rb
-%{__chmod} 644 panel-applet/sample/hello-applet.rb
-%{__chmod} 644 poppler/sample/pdf2text.rb
-%{__chmod} 644 poppler/sample/pdf2.rb
-%{__chmod} 644 rsvg/sample/svg-viewer.rb
-%{__chmod} 644 vte/sample/multiterm.rb
-%{__chmod} 644 vte/sample/terminal.rb
+# suppress lots of messages..
+set +x
+find . -name \*.rb -or -name \*.c | while read f ; do
+ chmod 0644 $f
+done
+set -x
%build
ruby extconf.rb
@@ -475,13 +503,9 @@
# 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
+sed -i.betaver -e '/GTKMOZEMBED_MINOR_VERSION/s|(.*)|(9)|' \
+ gtkmozembed/src/rbgtkmozembedversion.h
%endif
-## For glib (?? maybe on glib2 >= 2.15?)
-sed -i.comma -e 's|\(G_MARKUP_COLLECT_[A-Z]*\),,|\1,|' \
- glib/src/glib-enum-types.c
-
make %{?_smp_mflags}
@@ -510,6 +534,18 @@
%{ruby_sitearch}/rbatk.h
%{ruby_sitearch}/rbatkversion.h
+%files -n ruby-bonobo2
+%defattr(-,root,root,-)
+%doc bonobo/ChangeLog bonobo/COPYING.LIB bonobo/README
+%{ruby_sitelib}/bonobo2.rb
+%{ruby_sitearch}/bonobo2.so
+
+%files -n ruby-bonoboui2
+%defattr(-,root,root,-)
+%doc bonoboui/ChangeLog bonoboui/COPYING.LIB bonoboui/README
+%{ruby_sitelib}/bonoboui2.rb
+%{ruby_sitearch}/bonoboui2.so
+
%files -n ruby-gconf2
%defattr(-,root,root,-)
%doc gconf/ChangeLog gconf/COPYING.LIB gconf/README gconf/sample
@@ -533,6 +569,7 @@
%files -n ruby-glib2-devel
%defattr(-,root,root,-)
+%{ruby_sitearch}/rbgcompat.h
%{ruby_sitearch}/rbglib.h
%{ruby_sitearch}/rbgobject.h
%{ruby_sitearch}/rbgutil.h
@@ -561,6 +598,12 @@
%{ruby_sitelib}/gnomevfs.rb
%{ruby_sitearch}/gnomevfs.so
+%files -n ruby-gstreamer
+%defattr(-,root,root,-)
+%doc gstreamer/ChangeLog gstreamer/COPYING.LIB gstreamer/README
+%{ruby_sitelib}/gst.rb
+%{ruby_sitearch}/gst.so
+
%files -n ruby-gtk2
%defattr(-,root,root,-)
%doc gtk/ChangeLog gtk/COPYING.LIB gtk/README gtk/sample
@@ -601,6 +644,7 @@
%files -n ruby-libart2
%defattr(-,root,root,-)
%doc libart/ChangeLog libart/COPYING.LIB libart/README libart/sample
+%{ruby_sitelib}/libart2.rb
%{ruby_sitearch}/libart2.so
%files -n ruby-libart2-devel
@@ -652,6 +696,14 @@
%changelog
+* Sun Jun 8 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.17.0-0.1.rc1
+- 0.17.0 rc1
+- Remove upstreamed patches - 2 patches remain
+ - ruby-gnome2-0.17.0-rc1-script.patch
+ - ruby-gnome2-all-0.16.0-xulrunner.patch
+- Restrict ruby abi dependency to exact 1.8 version
+- Fix the license (to strict LGPLv2)
+
* Thu Mar 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.16.0-28
- Workarround for poppler 0.7.2
--- ruby-gnome2-all-0.16.0-glib-2.14.patch DELETED ---
--- ruby-gnome2-all-0.16.0-gtk-security.patch DELETED ---
--- ruby-gnome2-all-0.16.0-libglade2.patch DELETED ---
--- ruby-gnome2-all-0.16.0-newpoppler.patch DELETED ---
--- ruby-gnome2-all-0.16.0-typedef.patch DELETED ---
--- ruby-gnome2-script.patch DELETED ---
- Previous message (by thread): rpms/taskjuggler/devel taskjuggler-2.4.1-no-kdepim3.patch, NONE, 1.1 taskjuggler.spec, 1.21, 1.22
- Next message (by thread): rpms/rubygem-activeldap/devel .cvsignore, 1.2, 1.3 rubygem-activeldap.spec, 1.2, 1.3 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list