From ce7af4872eab795d7037a5e100f188e2c52f99c7 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Fri, 2 Dec 2011 00:34:28 +0900 Subject: [PATCH] 1.10.2 Make dependency for pkg-config be development only again Change the license tag to "GPLv2 or Ruby" Remove defattr --- .gitignore | 1 + rubygem-cairo.spec | 95 +++++++++++++++++++++------------------------- sources | 2 +- 3 files changed, 46 insertions(+), 52 deletions(-) diff --git a/.gitignore b/.gitignore index 5bcec15..ee75121 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /cairo-1.10.0.gem +/cairo-1.10.2.gem diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 636b4a6..6be25ef 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -3,28 +3,23 @@ %global rubyabi 1.8 %global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) -%define gemname cairo -%define geminstdir %{gemdir}/gems/%{gemname}-%{version} +%global gemname cairo +%global geminstdir %{gemdir}/gems/%{gemname}-%{version} -%global mainver 1.10.0 -%global gitver %(echo %mainver | sed -e 's|\.|_|g') # Upstream GIT http://github.com/rcairo/ Summary: Ruby bindings for cairo Name: rubygem-%{gemname} -Version: 1.10.0 -Release: 4%{?dist} +Version: 1.10.2 +Release: 1%{?dist} Group: Development/Languages License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ Source0: http://rubygems.org/downloads/%{gemname}-%{version}.gem -# This one is needed -# wget -N -O %%gemname-%%mainver-ext.cairo.depend http://github.com/rcairo/rcairo/raw/RELEASE_%%{gitver}/ext/cairo/depend -Source100: %{gemname}-1.10.0-ext.cairo.depend BuildRequires: ruby(abi) = %{rubyabi} -BuildRequires: ruby(rubygems) +BuildRequires: rubygems BuildRequires: cairo-devel BuildRequires: ruby-devel # For %%check @@ -34,7 +29,7 @@ BuildRequires: rubygem(pkg-config) # `initialize': out of memory (NoMemoryError) BuildRequires: dejavu-serif-fonts Requires: ruby(abi) = %{rubyabi} -Requires: ruby(rubygems) +Requires: rubygems Provides: rubygem(%{gemname}) = %{version}-%{release} %description @@ -51,6 +46,8 @@ Requires: %{name} = %{version}-%{release} This package contains documentation for %{name}. %package -n ruby-%{gemname} +# TODO: remove ruby-%%{gemname} compat package for F-17 +# TODO: needs dependency check Summary: Non-Gem support package for %{gemname} Group: Development/Languages Requires: %{name} = %{version}-%{release} @@ -67,13 +64,19 @@ Requires: cairo-devel Requires: ruby-devel # Obsoletes / Provides # ruby(cairo-devel) Provides is for compatibility +# +# Actually ruby(cairo-dock) provides should not exist - +# Remove on F-17 and above Obsoletes: ruby-cairo-devel < 1.9 Provides: ruby-cairo-devel = %{version}-%{release} +%if 0%{?fedora} < 17 Provides: ruby(cairo-devel) = %{version}-%{release} +%endif %description devel Header files and libraries for building a extension library for the ruby-cairo + %prep %setup -q -T -c @@ -85,18 +88,12 @@ gem install \ -V --force \ %{SOURCE0} -# Install ext/cairo/depend -pushd .%{geminstdir} -cp -p %{SOURCE100} ext/cairo/depend +find . -name \*.gem | xargs chmod 0644 %build -# Make pkg-config development-dependent -# Already in upstream git. For now change manually -# -sed -i -e '/pkg-config/s|project\.extra_deps|project.extra_dev_deps|' \ - .%{geminstdir}/Rakefile -sed -i -e '/pkg-config/s|add_runtime_dependency|add_development_dependency|' \ - .%{gemdir}/specifications/%{gemname}-%{version}.gemspec +# pkg-config dependency should be for deelopment +find . -name \*.gemspec | \ + xargs sed -i -e '\@pkg-config@s|runtime_dependency|development_dependency|' # Once install to TMPINSTDIR for %%check rm -rf ./TMPINSTDIR @@ -104,16 +101,6 @@ mkdir -p ./TMPINSTDIR/%{gemdir} cp -a ./%{gemdir}/* ./TMPINSTDIR/%{gemdir} TOPDIR=$(pwd) -## Install C extensions, header files -pushd .%{geminstdir} -# Once create Makefile, then: -ruby extconf.rb - -make -C ext/cairo \ - install \ - INSTALL="install -p" \ - DESTDIR=$TOPDIR/TMPINSTDIR/ -popd ## remove all shebang, set permission to 0644 for f in $(find ./TMPINSTDIR/%{geminstdir} -name \*.rb) @@ -129,22 +116,25 @@ grep -rl '%{gemname}.so' . | \ -e "\@require@s|'%{gemname}.so'|'%{gemname}/%{gemname}.so'|" \ -e '\@require@s|"%{gemname}.so"|"%{gemname}/%{gemname}.so"|' popd -pushd ./TMPINSTDIR/%{ruby_sitearch} -mkdir %{gemname} -mv %{gemname}.so %{gemname}/ +mkdir -p ./TMPINSTDIR/%{ruby_sitearch}/%{gemname} +pushd ./TMPINSTDIR +mv .%{geminstdir}/lib/%{gemname}.so \ + ./%{ruby_sitearch}/%{gemname}/ + +# Move header +mv ./%{geminstdir}/lib/*.h \ + ./%{ruby_sitearch}/ + popd + # cleanups rm -rf ./TMPINSTDIR/%{geminstdir}/ext/ -rm -f ./TMPINSTDIR/%{geminstdir}/lib/*.so rm -f ./TMPINSTDIR/%{geminstdir}/{Makefile*,extconf.rb} %install -rm -rf %{buildroot} -mkdir -p %{buildroot} cp -a ./TMPINSTDIR/* %{buildroot}/ - # The following method is completely copied from rubygem-gettext # spec file # @@ -206,9 +196,6 @@ popd create_symlink_rec %{geminstdir}/lib %{ruby_sitelib} -%clean -rm -rf %{buildroot} - %check export RUBYLIB=$(pwd)/TMPINSTDIR/%{ruby_sitearch} @@ -221,46 +208,52 @@ ln -sf /bin/true make export PATH=$(pwd):$PATH popd -# https://github.com/rcairo/rcairo/issues/issue/4 -# test_new(RecordingSurfaceTest) fails with cairo 1.10.2. With cairo -# 1.8.10 (Fedora 13) this test is successful. Please someone investigate!! -ruby ./test/run-test.rb --verbose || true +# 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 +ruby ./test/run-test.rb popd %files -%defattr(-,root, root,-) %dir %{ruby_sitearch}/%{gemname}/ %{ruby_sitearch}/%{gemname}/%{gemname}.so %dir %{geminstdir}/ %doc %{geminstdir}/[A-Z]* +%exclude %{geminstdir}/Gemfile %exclude %{geminstdir}/Rakefile %{geminstdir}/lib/ %{gemdir}/cache/%{gemname}-%{version}.gem %{gemdir}/specifications/%{gemname}-%{version}.gemspec %files doc -%defattr(-,root,root,-) +%{geminstdir}/Gemfile %{geminstdir}/Rakefile -%{geminstdir}/misc/ %{geminstdir}/samples/ %{geminstdir}/test/ %{gemdir}/doc/%{gemname}-%{version}/ %files -n ruby-%{gemname} -%defattr(-,root,root,-) %{ruby_sitelib}/%{gemname}.rb %{ruby_sitelib}/%{gemname}/ %files devel -%defattr(-,root,root,-) %{ruby_sitearch}/rb_cairo.h %changelog +* Wed Nov 30 2011 Mamoru Tasaka - 1.10.2-1 +- 1.10.2 +- Make dependency for pkg-config be development only again +- Change the license tag to "GPLv2 or Ruby" +- Remove defattr + +* Sun Oct 16 2011 Mamoru Tasaka - 1.10.1-1 +- 1.10.1 + * Mon Feb 14 2011 Mamoru Tasaka 1.10.0-4 - F-15 mass rebuild - Ignore test failure for now -* Sun Oct 31 2010 Mamoru Taska 1.10.0-3 +* Sun Oct 31 2010 Mamoru Tasaka 1.10.0-3 - Move C extension so that "require %%gemname" works correctly * Tue Oct 5 2010 Mamoru Tasaka 1.10.0-2 diff --git a/sources b/sources index 6e8e3f4..4b6ee48 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9511621d4fdb60e67c8b87f63e6d54d2 cairo-1.10.0.gem +643103c9f8fe61d167cf3136f359398a cairo-1.10.2.gem