diff options
| author | Mamoru TASAKA <mtasaka@fedoraproject.org> | 2013-03-17 06:32:38 (GMT) |
|---|---|---|
| committer | Mamoru TASAKA <mtasaka@fedoraproject.org> | 2013-03-17 06:32:38 (GMT) |
| commit | 56623a4917a6d85c88cd54ea31a9fb370b611768 (patch) | |
| tree | 8e28bc2a35a417be93814e1d44bd9e179d4c1520 | |
| parent | ee63fe20032f24cc67979152aff7904f0b2a198c (diff) | |
| download | alexandria-master.zip alexandria-master.tar.gz alexandria-master.tar.bz2 | |
| -rw-r--r-- | alexandria.spec | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/alexandria.spec b/alexandria.spec index fa751d8..0e295e2 100644 --- a/alexandria.spec +++ b/alexandria.spec @@ -1,15 +1,14 @@ -%if 0%{?fedora} >= 17 +%if 0%{?fedora} <= 19 %define rubyabi 1.9.1 -%else -%define rubyabi 1.8 %endif + %define repoid 76353 %define majorver 0.6.9 %undefine minorver %undefine ifpre -%define fedorarel 4 +%define fedorarel 5 %define rel %{?ifpre:0.}%{fedorarel}%{?minorver:.%minorver} @@ -86,7 +85,17 @@ Patch24: alexandria-0.6.9-iconv.patch Patch25: alexandria-0.6.9-newbook-nothread.patch BuildArch: noarch -BuildRequires: ruby(abi) >= %{rubyabi} + +%if 0%{?fedora} >= 19 +Requires: ruby(release) +BuildRequires: ruby(release) +%else +Requires: ruby(abi) = %{rubyabi} +Requires: ruby +BuildRequires: ruby(abi) = %{rubyabi} +BuildRequires: ruby +%endif + # For ruby macros BuildRequires: ruby-devel BuildRequires: rubygem(rake) @@ -96,9 +105,6 @@ BuildRequires: GConf2 BuildRequires: gettext BuildRequires: intltool -Requires: ruby -Requires: ruby(abi) >= %{rubyabi} - # Amazon AWS v3 -> v4 switch # AWS v4 is supported by alexandria itself # But hpricot is still needed @@ -129,6 +135,10 @@ Requires: rubygem(glib2) # Added from 0.6.8 Requires: rubygem(goocanvas) Requires: rubygem(gstreamer) +# Uses syck (bug 922217) +%if 0%{?fedora} >= 19 +Requires: rubygem(syck) +%endif Requires(pre): GConf2 Requires(post): GConf2 @@ -255,6 +265,10 @@ exit 0 %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog +* Sun Mar 17 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.9-5 +- F-19: rebuild for ruby 2.0.0 +- F-19: require rubygem(syck) (bug 922217) + * Sat Feb 16 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.6.9-4 - Kill iconv and use encode instead - Handle the case thread was not created with adding new book |