diff --git a/.gitignore b/.gitignore index 3751138..2ca1445 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /cairo-1.12.2-af3e3fc059.gem /cairo-1.12.2.gem /cairo-1.12.3.gem +/cairo-1.12.4.gem diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index b88bdd4..6133add 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -4,7 +4,9 @@ %endif %if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 +%if 0%{?fedora} < 19 %global rubyabi 1.9.1 +%endif %global header_dir %{ruby_vendorarchdir} %global ruby19 1 %else @@ -14,7 +16,7 @@ %endif %global gem_name cairo -%global gemver 1.12.3 +%global gemver 1.12.4 #%%global gem_githash af3e3fc059 # Upstream GIT http://github.com/rcairo/ @@ -34,7 +36,16 @@ Source0: %{gem_name}-%{gemver}-%{gem_githash}.gem # Git based gem is created by below Source1: create-cairo-gem.sh +%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: rubygems-devel BuildRequires: cairo-devel BuildRequires: ruby-devel @@ -44,7 +55,6 @@ BuildRequires: rubygem(pkg-config) # Make sure at least one font is available for test/test_context.rb:57 # `initialize': out of memory (NoMemoryError) BuildRequires: dejavu-serif-fonts -Requires: ruby(abi) = %{rubyabi} Requires: rubygems Provides: rubygem(%{gem_name}) = %{version}-%{release} @@ -103,11 +113,7 @@ ruby-cairo mkdir -p ./%{gem_dir} export CONFIGURE_ARGS="--with-cflags='%{optflags}'" -gem install \ - --local \ - --install-dir ./%{gem_dir} \ - -V --force \ - %{SOURCE0} +%gem_install -n %{SOURCE0} find . -name \*.gem | xargs chmod 0644 @@ -145,9 +151,9 @@ mv .%{gem_instdir}/lib/%{gem_name}.so \ %else popd pushd ./TMPINSTDIR -mkdir -p .%{gem_extdir}/lib +mkdir -p .%{gem_extdir_mri}/lib mv .%{gem_instdir}/lib/%{gem_name}.so \ - ./%{gem_extdir}/lib + ./%{gem_extdir_mri}/lib %endif # Move header @@ -229,7 +235,7 @@ create_symlink_rec %{gem_instdir}/lib %{ruby_sitelib} %check %if %{ruby19} -export RUBYLIB=$(pwd)/TMPINSTDIR/%{gem_instdir}:$(pwd)/TMPINSTDIR/%{gem_extdir}/lib +export RUBYLIB=$(pwd)/TMPINSTDIR/%{gem_instdir}:$(pwd)/TMPINSTDIR/%{gem_extdir_mri}/lib %else export RUBYLIB=$(pwd)/TMPINSTDIR/%{ruby_sitearch} %endif @@ -256,9 +262,9 @@ popd %dir %{ruby_sitearch}/%{gem_name}/ %{ruby_sitearch}/%{gem_name}/%{gem_name}.so %else -%dir %{gem_extdir} -%dir %{gem_extdir}/lib -%{gem_extdir}/lib/%{gem_name}.so +%dir %{gem_extdir_mri} +%dir %{gem_extdir_mri}/lib +%{gem_extdir_mri}/lib/%{gem_name}.so %endif %dir %{gem_instdir}/ %doc %{gem_instdir}/[A-Z]* @@ -285,6 +291,15 @@ popd %{header_dir}/rb_cairo.h %changelog +* Tue Mar 19 2013 Mamoru TASAKA - 1.12.4-1 +- 1.12.4 + +* Sun Mar 3 2013 Mamoru TASAKA - 1.12.3-3 +- F-19: Rebuild for ruby 2.0.0 + +* Thu Feb 14 2013 Fedora Release Engineering - 1.12.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Thu Oct 6 2012 Mamoru TASAKA - 1.12.3-1 - 1.12.3 diff --git a/sources b/sources index f8e3a8d..75d258a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f759a4d2a00e7fca6ab44b44d3461558 cairo-1.12.3.gem +003085c8af34fd0a2e6a01d7096091dd cairo-1.12.4.gem