From daa600f9198350c4e743a2c07fabb1034aa5f0c2 Mon Sep 17 00:00:00 2001 From: TASAKA Mamoru Date: Wed, 18 Apr 2012 18:42:50 +0900 Subject: [PATCH 1/9] Update to 1.12.2 - And use git based gem for now to avoid test failure --- .gitignore | 1 + create-cairo-gem.sh | 16 ++++++++++++++++ rubygem-cairo.spec | 18 ++++++++++++++++-- sources | 2 +- 4 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 create-cairo-gem.sh diff --git a/.gitignore b/.gitignore index ee75121..be7f1ce 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /cairo-1.10.0.gem /cairo-1.10.2.gem +/cairo-1.12.2-af3e3fc059.gem diff --git a/create-cairo-gem.sh b/create-cairo-gem.sh new file mode 100644 index 0000000..08948c1 --- /dev/null +++ b/create-cairo-gem.sh @@ -0,0 +1,16 @@ +#!/bin/sh +set -x + +ORIGDIR=$(pwd) + +DIR=$(mktemp -p /tmp -d tmp.XXXXXX) +pushd $DIR +git clone https://github.com/rcairo/rcairo.git +cd rcairo + +VERSION=$(gem build cairo.gemspec 2>&1 | sed -n -e 's|^.*Version: ||p') +GITHASH=$(git log | head -n 1 | sed -e 's|^.* \(..........\).*|\1|') +cp -p cairo-$VERSION.gem $ORIGDIR/cairo-$VERSION-$GITHASH.gem + +popd +rm -rf $DIR diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 154bb5e..36a4b35 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -14,17 +14,25 @@ %endif %global gem_name cairo +%global gemver 1.12.2 +%global gem_githash af3e3fc059 # Upstream GIT http://github.com/rcairo/ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} -Version: 1.10.2 -Release: 4%{?dist} +Version: %{gemver} +Release: 1.git%{gem_githash}%{?dist} Group: Development/Languages License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ +%if 0 Source0: http://rubygems.org/downloads/%{gem_name}-%{version}.gem +%else +Source0: %{gem_name}-%{gemver}-%{gem_githash}.gem +%endif +# Git based gem is created by below +Source1: create-cairo-gem.sh BuildRequires: ruby(abi) = %{rubyabi} BuildRequires: rubygems-devel @@ -238,6 +246,8 @@ popd # Fix up test/run-test.rb sed -i -e '\@require .rubygems@a\\ngem "test-unit"\n' test/run-test.rb sed -i -e "\@require 'bundler/setup'@d" test/run-test.rb +sed -i -e "\@require@s|test-unit|test/unit|" test/run-test.rb + ruby ./test/run-test.rb popd @@ -275,6 +285,10 @@ popd %{header_dir}/rb_cairo.h %changelog +* Wed Apr 18 2012 Mamoru Tasaka - 1.12.2-1.gitaf3e3fc059 +- Update to 1.12.2 +- And use git based gem for now to avoid test failure + * Tue Apr 03 2012 Vít Ondruch - 1.10.2-4 - Fix conditionals for F17 to work for RHEL 7 as well. diff --git a/sources b/sources index 4b6ee48..66da5e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -643103c9f8fe61d167cf3136f359398a cairo-1.10.2.gem +6ce7a1a0fd23c3f0ef34e5395a2615d0 cairo-1.12.2-af3e3fc059.gem From dcc9bdda292d4b5fa711cc6e89a2030deb4f3f0e Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Wed, 18 Apr 2012 20:19:26 +0900 Subject: [PATCH 2/9] not yet pushed, fixing release number --- rubygem-cairo.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 36a4b35..7ebe0df 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -22,7 +22,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 1.git%{gem_githash}%{?dist} +Release: 0.1.git%{gem_githash}%{?dist} Group: Development/Languages License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ @@ -285,8 +285,8 @@ popd %{header_dir}/rb_cairo.h %changelog -* Wed Apr 18 2012 Mamoru Tasaka - 1.12.2-1.gitaf3e3fc059 -- Update to 1.12.2 +* Wed Apr 18 2012 Mamoru Tasaka - 1.12.2-0.1.gitaf3e3fc059 +- Update to 1.12.1 - And use git based gem for now to avoid test failure * Tue Apr 03 2012 Vít Ondruch - 1.10.2-4 From 6718b2a74a9d9afca8e545e0ec67eea31b6c94c4 Mon Sep 17 00:00:00 2001 From: TASAKA Mamoru Date: Thu, 6 Sep 2012 14:42:03 +0900 Subject: [PATCH 3/9] Update to 1.12.2 formal --- .gitignore | 1 + rubygem-cairo.spec | 14 ++++++++++---- sources | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index be7f1ce..497e28f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /cairo-1.10.0.gem /cairo-1.10.2.gem /cairo-1.12.2-af3e3fc059.gem +/cairo-1.12.2.gem diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 7ebe0df..1d892d8 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -15,18 +15,18 @@ %global gem_name cairo %global gemver 1.12.2 -%global gem_githash af3e3fc059 +#%%global gem_githash af3e3fc059 # Upstream GIT http://github.com/rcairo/ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 0.1.git%{gem_githash}%{?dist} +Release: 1%{?dist} Group: Development/Languages License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ -%if 0 +%if 1 Source0: http://rubygems.org/downloads/%{gem_name}-%{version}.gem %else Source0: %{gem_name}-%{gemver}-%{gem_githash}.gem @@ -112,7 +112,7 @@ gem install \ find . -name \*.gem | xargs chmod 0644 %build -# pkg-config dependency should be for deelopment +# pkg-config dependency should be for development find . -name \*.gemspec | \ xargs sed -i -e '\@pkg-config@s|runtime_dependency|development_dependency|' @@ -285,6 +285,12 @@ popd %{header_dir}/rb_cairo.h %changelog +* Thu Sep 6 2012 Mamoru Tasaka - 1.12.2-1 +- Update to 1.12.2 formal + +* Sat Jul 21 2012 Fedora Release Engineering - 1.12.2-0.2.gitaf3e3fc059 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Wed Apr 18 2012 Mamoru Tasaka - 1.12.2-0.1.gitaf3e3fc059 - Update to 1.12.1 - And use git based gem for now to avoid test failure diff --git a/sources b/sources index 66da5e1..cc0aba0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6ce7a1a0fd23c3f0ef34e5395a2615d0 cairo-1.12.2-af3e3fc059.gem +94897684caf2e17dac084f4573e46d5f cairo-1.12.2.gem From fb8c19a8e2a85a70ac92335e01a6dda3d9ec1c87 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 16:18:09 -0600 Subject: [PATCH 4/9] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index b88bdd4..08cb58b 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -22,7 +22,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Languages License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ @@ -285,6 +285,9 @@ popd %{header_dir}/rb_cairo.h %changelog +* 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 From 7bc52c3bce8d283484f5664fd8b5b8e5e35330cb Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 3 Mar 2013 03:37:46 +0900 Subject: [PATCH 5/9] F-19: Rebuild for ruby 2.0.0 --- rubygem-cairo.spec | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 08cb58b..b2a7ea0 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 @@ -22,7 +24,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Languages License: GPLv2 or Ruby URL: http://cairographics.org/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} @@ -285,6 +295,9 @@ popd %{header_dir}/rb_cairo.h %changelog +* 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 From 7f6a5f56bc026126195ac8f8189897a26c3ef0fc Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 3 Mar 2013 03:41:25 +0900 Subject: [PATCH 6/9] change directory name --- rubygem-cairo.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index b2a7ea0..47cc43b 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -155,9 +155,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 @@ -239,7 +239,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 @@ -266,9 +266,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]* From 130ea18dfa78e5d4f9ea9dbc11cbc7630206e5e0 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 3 Mar 2013 04:16:54 +0900 Subject: [PATCH 7/9] use %%gem_install --- rubygem-cairo.spec | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 47cc43b..5d5f159 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -24,7 +24,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 3%{?dist} +Release: 3%{?dist}.1 Group: Development/Languages License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ @@ -113,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 find . -name \*.gem | xargs chmod 0644 From bb05ab023dff6eba56f7375580fdbefc26bdfd69 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 3 Mar 2013 04:28:23 +0900 Subject: [PATCH 8/9] oops... --- rubygem-cairo.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 5d5f159..8ad4a5c 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -113,7 +113,7 @@ ruby-cairo mkdir -p ./%{gem_dir} export CONFIGURE_ARGS="--with-cflags='%{optflags}'" -%gem_install +%gem_install -n %{SOURCE0} find . -name \*.gem | xargs chmod 0644 From a80d1a34fa1428e91bff3fcae8961acdacb6858f Mon Sep 17 00:00:00 2001 From: TASAKA Mamoru Date: Tue, 19 Mar 2013 19:53:09 +0900 Subject: [PATCH 9/9] 1.12.4 --- .gitignore | 1 + rubygem-cairo.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) 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 8ad4a5c..6133add 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -16,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/ @@ -24,7 +24,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 3%{?dist}.1 +Release: 1%{?dist} Group: Development/Languages License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ @@ -291,6 +291,9 @@ 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 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