1.10.2
Make dependency for pkg-config be development only again Change the license tag to "GPLv2 or Ruby" Remove defattr
This commit is contained in:
parent
2cdb9ba111
commit
ce7af4872e
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
|||||||
/cairo-1.10.0.gem
|
/cairo-1.10.0.gem
|
||||||
|
/cairo-1.10.2.gem
|
||||||
|
@ -3,28 +3,23 @@
|
|||||||
%global rubyabi 1.8
|
%global rubyabi 1.8
|
||||||
|
|
||||||
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
|
%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
|
||||||
%define gemname cairo
|
%global gemname cairo
|
||||||
%define geminstdir %{gemdir}/gems/%{gemname}-%{version}
|
%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/
|
# Upstream GIT http://github.com/rcairo/
|
||||||
|
|
||||||
Summary: Ruby bindings for cairo
|
Summary: Ruby bindings for cairo
|
||||||
Name: rubygem-%{gemname}
|
Name: rubygem-%{gemname}
|
||||||
Version: 1.10.0
|
Version: 1.10.2
|
||||||
Release: 4%{?dist}
|
Release: 1%{?dist}
|
||||||
Group: Development/Languages
|
Group: Development/Languages
|
||||||
License: GPLv2 or Ruby
|
License: GPLv2 or Ruby
|
||||||
URL: http://cairographics.org/rcairo/
|
URL: http://cairographics.org/rcairo/
|
||||||
Source0: http://rubygems.org/downloads/%{gemname}-%{version}.gem
|
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(abi) = %{rubyabi}
|
||||||
BuildRequires: ruby(rubygems)
|
BuildRequires: rubygems
|
||||||
BuildRequires: cairo-devel
|
BuildRequires: cairo-devel
|
||||||
BuildRequires: ruby-devel
|
BuildRequires: ruby-devel
|
||||||
# For %%check
|
# For %%check
|
||||||
@ -34,7 +29,7 @@ BuildRequires: rubygem(pkg-config)
|
|||||||
# `initialize': out of memory (NoMemoryError)
|
# `initialize': out of memory (NoMemoryError)
|
||||||
BuildRequires: dejavu-serif-fonts
|
BuildRequires: dejavu-serif-fonts
|
||||||
Requires: ruby(abi) = %{rubyabi}
|
Requires: ruby(abi) = %{rubyabi}
|
||||||
Requires: ruby(rubygems)
|
Requires: rubygems
|
||||||
Provides: rubygem(%{gemname}) = %{version}-%{release}
|
Provides: rubygem(%{gemname}) = %{version}-%{release}
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -51,6 +46,8 @@ Requires: %{name} = %{version}-%{release}
|
|||||||
This package contains documentation for %{name}.
|
This package contains documentation for %{name}.
|
||||||
|
|
||||||
%package -n ruby-%{gemname}
|
%package -n ruby-%{gemname}
|
||||||
|
# TODO: remove ruby-%%{gemname} compat package for F-17
|
||||||
|
# TODO: needs dependency check
|
||||||
Summary: Non-Gem support package for %{gemname}
|
Summary: Non-Gem support package for %{gemname}
|
||||||
Group: Development/Languages
|
Group: Development/Languages
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
@ -67,13 +64,19 @@ Requires: cairo-devel
|
|||||||
Requires: ruby-devel
|
Requires: ruby-devel
|
||||||
# Obsoletes / Provides
|
# Obsoletes / Provides
|
||||||
# ruby(cairo-devel) Provides is for compatibility
|
# 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
|
Obsoletes: ruby-cairo-devel < 1.9
|
||||||
Provides: ruby-cairo-devel = %{version}-%{release}
|
Provides: ruby-cairo-devel = %{version}-%{release}
|
||||||
|
%if 0%{?fedora} < 17
|
||||||
Provides: ruby(cairo-devel) = %{version}-%{release}
|
Provides: ruby(cairo-devel) = %{version}-%{release}
|
||||||
|
%endif
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
Header files and libraries for building a extension library for the
|
Header files and libraries for building a extension library for the
|
||||||
ruby-cairo
|
ruby-cairo
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -T -c
|
%setup -q -T -c
|
||||||
|
|
||||||
@ -85,18 +88,12 @@ gem install \
|
|||||||
-V --force \
|
-V --force \
|
||||||
%{SOURCE0}
|
%{SOURCE0}
|
||||||
|
|
||||||
# Install ext/cairo/depend
|
find . -name \*.gem | xargs chmod 0644
|
||||||
pushd .%{geminstdir}
|
|
||||||
cp -p %{SOURCE100} ext/cairo/depend
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# Make pkg-config development-dependent
|
# pkg-config dependency should be for deelopment
|
||||||
# Already in upstream git. For now change manually
|
find . -name \*.gemspec | \
|
||||||
#
|
xargs sed -i -e '\@pkg-config@s|runtime_dependency|development_dependency|'
|
||||||
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
|
|
||||||
|
|
||||||
# Once install to TMPINSTDIR for %%check
|
# Once install to TMPINSTDIR for %%check
|
||||||
rm -rf ./TMPINSTDIR
|
rm -rf ./TMPINSTDIR
|
||||||
@ -104,16 +101,6 @@ mkdir -p ./TMPINSTDIR/%{gemdir}
|
|||||||
cp -a ./%{gemdir}/* ./TMPINSTDIR/%{gemdir}
|
cp -a ./%{gemdir}/* ./TMPINSTDIR/%{gemdir}
|
||||||
|
|
||||||
TOPDIR=$(pwd)
|
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
|
## remove all shebang, set permission to 0644
|
||||||
for f in $(find ./TMPINSTDIR/%{geminstdir} -name \*.rb)
|
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'|" \
|
||||||
-e '\@require@s|"%{gemname}.so"|"%{gemname}/%{gemname}.so"|'
|
-e '\@require@s|"%{gemname}.so"|"%{gemname}/%{gemname}.so"|'
|
||||||
popd
|
popd
|
||||||
pushd ./TMPINSTDIR/%{ruby_sitearch}
|
mkdir -p ./TMPINSTDIR/%{ruby_sitearch}/%{gemname}
|
||||||
mkdir %{gemname}
|
pushd ./TMPINSTDIR
|
||||||
mv %{gemname}.so %{gemname}/
|
mv .%{geminstdir}/lib/%{gemname}.so \
|
||||||
|
./%{ruby_sitearch}/%{gemname}/
|
||||||
|
|
||||||
|
# Move header
|
||||||
|
mv ./%{geminstdir}/lib/*.h \
|
||||||
|
./%{ruby_sitearch}/
|
||||||
|
|
||||||
popd
|
popd
|
||||||
|
|
||||||
|
|
||||||
# cleanups
|
# cleanups
|
||||||
rm -rf ./TMPINSTDIR/%{geminstdir}/ext/
|
rm -rf ./TMPINSTDIR/%{geminstdir}/ext/
|
||||||
rm -f ./TMPINSTDIR/%{geminstdir}/lib/*.so
|
|
||||||
rm -f ./TMPINSTDIR/%{geminstdir}/{Makefile*,extconf.rb}
|
rm -f ./TMPINSTDIR/%{geminstdir}/{Makefile*,extconf.rb}
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf %{buildroot}
|
|
||||||
mkdir -p %{buildroot}
|
|
||||||
cp -a ./TMPINSTDIR/* %{buildroot}/
|
cp -a ./TMPINSTDIR/* %{buildroot}/
|
||||||
|
|
||||||
|
|
||||||
# The following method is completely copied from rubygem-gettext
|
# The following method is completely copied from rubygem-gettext
|
||||||
# spec file
|
# spec file
|
||||||
#
|
#
|
||||||
@ -206,9 +196,6 @@ popd
|
|||||||
|
|
||||||
create_symlink_rec %{geminstdir}/lib %{ruby_sitelib}
|
create_symlink_rec %{geminstdir}/lib %{ruby_sitelib}
|
||||||
|
|
||||||
%clean
|
|
||||||
rm -rf %{buildroot}
|
|
||||||
|
|
||||||
%check
|
%check
|
||||||
export RUBYLIB=$(pwd)/TMPINSTDIR/%{ruby_sitearch}
|
export RUBYLIB=$(pwd)/TMPINSTDIR/%{ruby_sitearch}
|
||||||
|
|
||||||
@ -221,46 +208,52 @@ ln -sf /bin/true make
|
|||||||
export PATH=$(pwd):$PATH
|
export PATH=$(pwd):$PATH
|
||||||
popd
|
popd
|
||||||
|
|
||||||
# https://github.com/rcairo/rcairo/issues/issue/4
|
# Fix up test/run-test.rb
|
||||||
# test_new(RecordingSurfaceTest) fails with cairo 1.10.2. With cairo
|
sed -i -e '\@require .rubygems@a\\ngem "test-unit"\n' test/run-test.rb
|
||||||
# 1.8.10 (Fedora 13) this test is successful. Please someone investigate!!
|
sed -i -e "\@require 'bundler/setup'@d" test/run-test.rb
|
||||||
ruby ./test/run-test.rb --verbose || true
|
ruby ./test/run-test.rb
|
||||||
popd
|
popd
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root, root,-)
|
|
||||||
%dir %{ruby_sitearch}/%{gemname}/
|
%dir %{ruby_sitearch}/%{gemname}/
|
||||||
%{ruby_sitearch}/%{gemname}/%{gemname}.so
|
%{ruby_sitearch}/%{gemname}/%{gemname}.so
|
||||||
%dir %{geminstdir}/
|
%dir %{geminstdir}/
|
||||||
%doc %{geminstdir}/[A-Z]*
|
%doc %{geminstdir}/[A-Z]*
|
||||||
|
%exclude %{geminstdir}/Gemfile
|
||||||
%exclude %{geminstdir}/Rakefile
|
%exclude %{geminstdir}/Rakefile
|
||||||
%{geminstdir}/lib/
|
%{geminstdir}/lib/
|
||||||
%{gemdir}/cache/%{gemname}-%{version}.gem
|
%{gemdir}/cache/%{gemname}-%{version}.gem
|
||||||
%{gemdir}/specifications/%{gemname}-%{version}.gemspec
|
%{gemdir}/specifications/%{gemname}-%{version}.gemspec
|
||||||
|
|
||||||
%files doc
|
%files doc
|
||||||
%defattr(-,root,root,-)
|
%{geminstdir}/Gemfile
|
||||||
%{geminstdir}/Rakefile
|
%{geminstdir}/Rakefile
|
||||||
%{geminstdir}/misc/
|
|
||||||
%{geminstdir}/samples/
|
%{geminstdir}/samples/
|
||||||
%{geminstdir}/test/
|
%{geminstdir}/test/
|
||||||
%{gemdir}/doc/%{gemname}-%{version}/
|
%{gemdir}/doc/%{gemname}-%{version}/
|
||||||
|
|
||||||
%files -n ruby-%{gemname}
|
%files -n ruby-%{gemname}
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%{ruby_sitelib}/%{gemname}.rb
|
%{ruby_sitelib}/%{gemname}.rb
|
||||||
%{ruby_sitelib}/%{gemname}/
|
%{ruby_sitelib}/%{gemname}/
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-,root,root,-)
|
|
||||||
%{ruby_sitearch}/rb_cairo.h
|
%{ruby_sitearch}/rb_cairo.h
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Nov 30 2011 Mamoru Tasaka <mtasaka@fedoraproject.org> - 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 <mtasaka@fedoraproject.org> - 1.10.1-1
|
||||||
|
- 1.10.1
|
||||||
|
|
||||||
* Mon Feb 14 2011 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> 1.10.0-4
|
* Mon Feb 14 2011 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> 1.10.0-4
|
||||||
- F-15 mass rebuild
|
- F-15 mass rebuild
|
||||||
- Ignore test failure for now
|
- Ignore test failure for now
|
||||||
|
|
||||||
* Sun Oct 31 2010 Mamoru Taska <mtasaka@ioa.s.u-tokyo.ac.jp> 1.10.0-3
|
* Sun Oct 31 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> 1.10.0-3
|
||||||
- Move C extension so that "require %%gemname" works correctly
|
- Move C extension so that "require %%gemname" works correctly
|
||||||
|
|
||||||
* Tue Oct 5 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> 1.10.0-2
|
* Tue Oct 5 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> 1.10.0-2
|
||||||
|
Loading…
Reference in New Issue
Block a user