From 87ca3e69fa13c8490977b75b62b03cb85fade36d Mon Sep 17 00:00:00 2001 From: TASAKA Mamoru Date: Thu, 6 Dec 2012 13:25:55 +0900 Subject: [PATCH 1/2] 1.12.3 --- rubygem-cairo.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 1d892d8..5a02ffb 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -3,7 +3,7 @@ %global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']") %endif -%if %{?fedora:0%{fedora} >= 17}%{?rhel:0%{rhel} >= 7} +%if %{?fedora:0%{fedora} >= 17} || %{?rhel:0%{rhel} >= 7} %global rubyabi 1.9.1 %global header_dir %{ruby_vendorarchdir} %global ruby19 1 @@ -14,7 +14,7 @@ %endif %global gem_name cairo -%global gemver 1.12.2 +%global gemver 1.12.3 #%%global gem_githash af3e3fc059 # Upstream GIT http://github.com/rcairo/ @@ -49,7 +49,7 @@ Requires: rubygems Provides: rubygem(%{gem_name}) = %{version}-%{release} %if %{ruby19} -Obsoletes: ruby-%{gem_name} = %{version}-%{release} +Obsoletes: ruby-%{gem_name} <= %{version}-%{release} Provides: ruby-%{gem_name} = %{version}-%{release} %endif @@ -285,6 +285,9 @@ popd %{header_dir}/rb_cairo.h %changelog +* Thu Oct 6 2012 Mamoru TASAKA - 1.12.3-1 +- 1.12.3 + * Thu Sep 6 2012 Mamoru Tasaka - 1.12.2-1 - Update to 1.12.2 formal From 779d1411ab1d084e3e8d2321a57a9befad7ef02d Mon Sep 17 00:00:00 2001 From: TASAKA Mamoru Date: Thu, 6 Dec 2012 13:38:19 +0900 Subject: [PATCH 2/2] change boolean expression --- rubygem-cairo.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 5a02ffb..b88bdd4 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -3,7 +3,7 @@ %global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']") %endif -%if %{?fedora:0%{fedora} >= 17} || %{?rhel:0%{rhel} >= 7} +%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 %global rubyabi 1.9.1 %global header_dir %{ruby_vendorarchdir} %global ruby19 1