diff --git a/fantasdic.spec b/fantasdic.spec index b6bcd0f..cebb1ce 100644 --- a/fantasdic.spec +++ b/fantasdic.spec @@ -1,13 +1,11 @@ %define mainver 1.0 %define betaver beta7 -%if 0%{fedora} >= 17 + +%if 0%{fedora} < 19 %define rubyabi 1.9.1 -%else -%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")} -%define rubyabi 1.8 %endif -%define fedorarel 13 +%define fedorarel 14 %define fullrel %{?betaver:0.}%{fedorarel}%{?betaver:.%betaver} @@ -23,7 +21,6 @@ URL: http://www.gnome.org/projects/fantasdic/ Source0: http://www.mblondel.org/files/fantasdic/%{name}-%{mainver}%{?betaver:-%betaver}.tar.gz # ruby-gnome2-Bugs-2865895 # Patch0: fantasdic-1.0-beta7-workaround-rg2-bg2865895.patch -%if 0%{?fedora} >= 17 # Various ruby19 fixes # Need utf-8 encoding direction Patch10: fantasdic-1.0-beta7-ruby19-utf8.patch @@ -31,26 +28,27 @@ Patch10: fantasdic-1.0-beta7-ruby19-utf8.patch Patch11: fantasdic-1.0-beta7-ruby19-syntax.patch # Path fix for modules in ruby 19 Patch12: fantasdic-1.0-beta7-ruby19-pathfix.patch -%endif # Guard sigtrap when calling Gdk::flush (bug 844754, bug 799804) Patch13: fantasdic-1.0-beta7-guard-sigtrap.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +%if 0%{?fedora} >= 19 +Requires: ruby(release) +BuildRequires: ruby(release) +%else +Requires: ruby(abi) = %{rubyabi} +Requires: ruby +BuildRequires: ruby(abi) = %{rubyabi} +BuildRequires: ruby +%endif + BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: ruby BuildRequires: ruby-devel -BuildRequires: ruby(abi) = %{rubyabi} Requires: ruby -Requires: ruby(abi) = %{rubyabi} -%if 0%{?fedora} >= 17 Requires: rubygem(gettext) -%else -Requires: ruby(gettext-package) -%endif Requires: ruby(libglade2) Requires: ruby(gconf2) @@ -69,11 +67,9 @@ Fantasdic is Free Software. %prep %setup -q -n %{name}-%{mainver}%{?betaver:-%betaver} #%%patch0 -p1 -%if 0%{?fedora} >= 17 %patch10 -p1 %patch11 -p1 %patch12 -p1 -%endif %patch13 -p1 %{__chmod} 0644 tools/*.rb @@ -207,6 +203,9 @@ exit 0 %changelog +* Wed Mar 20 2013 Mamoru TASAKA - 1.0-0.14.beta7 +- F-19: rebuild for ruby 2.0 + * Sat Feb 9 2013 Mamoru TASAKA - 1.0-0.13-beta7 - F-19: kill vendorization of desktop file (fpc#247)