Merge remote-tracking branch 'origin/master' into f18
This commit is contained in:
commit
f2fbb55ef8
|
@ -3,7 +3,7 @@
|
||||||
%global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
|
%global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{?fedora:0%{fedora} >= 17}%{?rhel:0%{rhel} >= 7}
|
%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
|
||||||
%global rubyabi 1.9.1
|
%global rubyabi 1.9.1
|
||||||
%global header_dir %{ruby_vendorarchdir}
|
%global header_dir %{ruby_vendorarchdir}
|
||||||
%global ruby19 1
|
%global ruby19 1
|
||||||
|
@ -14,7 +14,7 @@
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%global gem_name cairo
|
%global gem_name cairo
|
||||||
%global gemver 1.12.2
|
%global gemver 1.12.3
|
||||||
#%%global gem_githash af3e3fc059
|
#%%global gem_githash af3e3fc059
|
||||||
|
|
||||||
# Upstream GIT http://github.com/rcairo/
|
# Upstream GIT http://github.com/rcairo/
|
||||||
|
@ -49,7 +49,7 @@ Requires: rubygems
|
||||||
Provides: rubygem(%{gem_name}) = %{version}-%{release}
|
Provides: rubygem(%{gem_name}) = %{version}-%{release}
|
||||||
|
|
||||||
%if %{ruby19}
|
%if %{ruby19}
|
||||||
Obsoletes: ruby-%{gem_name} = %{version}-%{release}
|
Obsoletes: ruby-%{gem_name} <= %{version}-%{release}
|
||||||
Provides: ruby-%{gem_name} = %{version}-%{release}
|
Provides: ruby-%{gem_name} = %{version}-%{release}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
@ -285,6 +285,9 @@ popd
|
||||||
%{header_dir}/rb_cairo.h
|
%{header_dir}/rb_cairo.h
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Oct 6 2012 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.12.3-1
|
||||||
|
- 1.12.3
|
||||||
|
|
||||||
* Thu Sep 6 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 1.12.2-1
|
* Thu Sep 6 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 1.12.2-1
|
||||||
- Update to 1.12.2 formal
|
- Update to 1.12.2 formal
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue