From 0d543b4dd426f6b25f2161ed3b256f2dc128e034 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Tue, 5 Oct 2010 23:49:54 +0900 Subject: [PATCH 001/127] Initial import --- .gitignore | 1 + cairo-1.10.0-ext.cairo.depend | 2 + rubygem-cairo.spec | 279 ++++++++++++++++++++++++++++++++++ sources | 1 + 4 files changed, 283 insertions(+) create mode 100644 cairo-1.10.0-ext.cairo.depend create mode 100644 rubygem-cairo.spec diff --git a/.gitignore b/.gitignore index e69de29..5bcec15 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/cairo-1.10.0.gem diff --git a/cairo-1.10.0-ext.cairo.depend b/cairo-1.10.0-ext.cairo.depend new file mode 100644 index 0000000..d267ff6 --- /dev/null +++ b/cairo-1.10.0-ext.cairo.depend @@ -0,0 +1,2 @@ +install-so: + $(INSTALL_DATA) $(srcdir)/rb_cairo.h $(RUBYARCHDIR) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec new file mode 100644 index 0000000..b9e089d --- /dev/null +++ b/rubygem-cairo.spec @@ -0,0 +1,279 @@ +%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']") +%global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']") +%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 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: 2%{?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: cairo-devel +BuildRequires: ruby-devel +BuildRequires(check): rubygem(test-unit) +BuildRequires(check): rubygem(pkg-config) +# Make sure at least one font is available for test/test_context.rb:57 +# `initialize': out of memory (NoMemoryError) +BuildRequires(check): dejavu-serif-fonts +Requires: ruby(abi) = %{rubyabi} +Requires: ruby(rubygems) +Provides: rubygem(%{gemname}) = %{version}-%{release} + +%description +Ruby bindings for cairo. Cairo is a 2D graphics library with support for +multiple output devices. Currently supported output targets include the +X Window System, win32, and image buffers. + +%package doc +Summary: Documentation for %{name} +Group: Documentation +Requires: %{name} = %{version}-%{release} + +%description doc +This package contains documentation for %{name}. + +%package -n ruby-%{gemname} +Summary: Non-Gem support package for %{gemname} +Group: Development/Languages +Requires: %{name} = %{version}-%{release} +Provides: ruby(%{gemname}) = %{version}-%{release} + +%description -n ruby-%{gemname} +This package provides non-Gem support for %{gemname}. + +%package devel +Summary: Ruby-cairo development environment +Group: Development/Languages +Requires: %{name} = %{version}-%{release} +Requires: cairo-devel +Requires: ruby-devel +# Obsoletes / Provides +# ruby(cairo-devel) Provides is for compatibility +Obsoletes: ruby-cairo-devel < 1.9 +Provides: ruby-cairo-devel = %{version}-%{release} +Provides: ruby(cairo-devel) = %{version}-%{release} + +%description devel +Header files and libraries for building a extension library for the +ruby-cairo +%prep +%setup -q -T -c + +mkdir -p ./%{gemdir} +export CONFIGURE_ARGS="--with-cflags='%{optflags}'" +gem install \ + --local \ + --install-dir ./%{gemdir} \ + -V --force \ + %{SOURCE0} + +# Install ext/cairo/depend +pushd .%{geminstdir} +cp -p %{SOURCE100} ext/cairo/depend + +%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 + +pushd .%{geminstdir} +# only create Makefile +export CFLAGS="%{optflags}" +ruby ./extconf.rb +popd + +%install +rm -rf %{buildroot} +mkdir -p %{buildroot}%{gemdir} +cp -a ./%{gemdir}/* %{buildroot}%{gemdir} + +# Install C extensions, header files +pushd .%{geminstdir} +make -C ext/cairo \ + install \ + INSTALL="install -p" \ + DESTDIR=%{buildroot}/ + +# remove all shebang, set permission to 0644 +for f in $(find %{buildroot}%{geminstdir} -name \*.rb) +do + sed -i -e '/^#!/d' $f + chmod 0644 $f +done + +# cleanups +rm -rf %{buildroot}%{geminstdir}/ext/ +rm -f %{buildroot}%{geminstdir}/lib/*.so + +rm -f %{buildroot}%{geminstdir}/{Makefile*,extconf.rb} + +# The following method is completely copied from rubygem-gettext +# spec file +# +# Create symlinks +## +## Note that before switching to gem %%{ruby_sitelib}/%%{gemname} +## already existed as a directory, so this cannot be replaced +## by symlink (cpio fails) +## Similarly, all directories under %%{ruby_sitelib} cannot be +## replaced by symlink +# + +create_symlink_rec(){ + +ORIGBASEDIR=$1 +TARGETBASEDIR=$2 + +## First calculate relative path of ORIGBASEDIR +## from TARGETBASEDIR +TMPDIR=$TARGETBASEDIR +BACKDIR= +DOWNDIR= +num=0 +nnum=0 +while true +do + num=$((num+1)) + TMPDIR=$(echo $TMPDIR | sed -e 's|/[^/][^/]*$||') + DOWNDIR=$(echo $ORIGBASEDIR | sed -e "s|^$TMPDIR||") + if [ x$DOWNDIR != x$ORIGBASEDIR ] + then + nnum=0 + while [ $nnum -lt $num ] + do + BACKDIR="../$BACKDIR" + nnum=$((nnum+1)) + done + break + fi +done + +RELBASEDIR=$( echo $BACKDIR/$DOWNDIR | sed -e 's|//*|/|g' ) + +## Next actually create symlink +pushd %{buildroot}/$ORIGBASEDIR +find . -type f | while read f +do + DIRNAME=$(dirname $f) + BACK2DIR=$(echo $DIRNAME | sed -e 's|/[^/][^/]*|/..|g') + mkdir -p %{buildroot}${TARGETBASEDIR}/$DIRNAME + LNNAME=$(echo $BACK2DIR/$RELBASEDIR/$f | \ + sed -e 's|^\./||' | sed -e 's|//|/|g' | \ + sed -e 's|/\./|/|' ) + ln -s -f $LNNAME %{buildroot}${TARGETBASEDIR}/$f +done +popd + +} + +create_symlink_rec %{geminstdir}/lib %{ruby_sitelib} + +%clean +rm -rf %{buildroot} + +%check +pushd ./%{geminstdir} +ruby ./test/run-test.rb --verbose +popd + +%files +%defattr(-,root, root,-) +%{ruby_sitearch}/%{gemname}.so +%dir %{geminstdir}/ +%doc %{geminstdir}/[A-Z]* +%exclude %{geminstdir}/Rakefile +%{geminstdir}/lib/ +%{gemdir}/cache/%{gemname}-%{version}.gem +%{gemdir}/specifications/%{gemname}-%{version}.gemspec + +%files doc +%defattr(-,root,root,-) +%{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 +* Tue Oct 5 2010 Mamoru Tasaka 1.10.0-2 +- Install one font at BuildRequires for test + +* Sun Sep 19 2010 Mamoru Tasaka 1.10.0-1 +- Update to 1.10.0 + +* Fri Sep 3 2010 Mamoru Tasaka 1.8.5-2 +- Switch to gem +- Fix license tag + +* Thu Sep 2 2010 Mamoru Tasaka 1.8.5-1 +- Update to 1.8.5 + +* Wed Dec 16 2009 Allisson Azevedo 1.8.1-1 +- Update to 1.8.1 + +* Sun Jul 26 2009 Fedora Release Engineering - 1.8.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 1.8.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Jan 23 2009 Allisson Azevedo 1.8.0-2 +- Rebuild + +* Sun Oct 5 2008 Allisson Azevedo 1.8.0-1 +- Update to 1.8.0 + +* Tue Sep 9 2008 Allisson Azevedo 1.7.0-1 +- Update to 1.7.0 + +* Sun May 18 2008 Allisson Azevedo 1.6.1-1 +- Update to 1.6.1 + +* Mon Feb 25 2008 Allisson Azevedo 1.5.1-1 +- Update to 1.5.1 +- Update License for GPLv2+ + +* Mon Feb 18 2008 Fedora Release Engineering - 1.5.0-2 +- Autorebuild for GCC 4.3 + +* Mon Jun 11 2007 Allisson Azevedo 1.5.0-1 +- Update to 1.5.0 + +* Sun Mar 28 2007 Allisson Azevedo 1.4.1-2 +- Changed license for Ruby License/GPL +- Add ruby-devel for devel requires +- Changed main group for System Environment/Libraries +- Changed install for keep timestamps + +* Sun Mar 26 2007 Allisson Azevedo 1.4.1-1 +- Initial RPM release diff --git a/sources b/sources index e69de29..6e8e3f4 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +9511621d4fdb60e67c8b87f63e6d54d2 cairo-1.10.0.gem From 0bb2cf8de34781fe771919d8c59bce11108d99a1 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Tue, 5 Oct 2010 23:50:57 +0900 Subject: [PATCH 002/127] Initial import --- .gitignore | 1 + cairo-1.10.0-ext.cairo.depend | 2 + rubygem-cairo.spec | 279 ++++++++++++++++++++++++++++++++++ sources | 1 + 4 files changed, 283 insertions(+) create mode 100644 cairo-1.10.0-ext.cairo.depend create mode 100644 rubygem-cairo.spec diff --git a/.gitignore b/.gitignore index e69de29..5bcec15 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/cairo-1.10.0.gem diff --git a/cairo-1.10.0-ext.cairo.depend b/cairo-1.10.0-ext.cairo.depend new file mode 100644 index 0000000..d267ff6 --- /dev/null +++ b/cairo-1.10.0-ext.cairo.depend @@ -0,0 +1,2 @@ +install-so: + $(INSTALL_DATA) $(srcdir)/rb_cairo.h $(RUBYARCHDIR) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec new file mode 100644 index 0000000..b9e089d --- /dev/null +++ b/rubygem-cairo.spec @@ -0,0 +1,279 @@ +%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']") +%global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']") +%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 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: 2%{?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: cairo-devel +BuildRequires: ruby-devel +BuildRequires(check): rubygem(test-unit) +BuildRequires(check): rubygem(pkg-config) +# Make sure at least one font is available for test/test_context.rb:57 +# `initialize': out of memory (NoMemoryError) +BuildRequires(check): dejavu-serif-fonts +Requires: ruby(abi) = %{rubyabi} +Requires: ruby(rubygems) +Provides: rubygem(%{gemname}) = %{version}-%{release} + +%description +Ruby bindings for cairo. Cairo is a 2D graphics library with support for +multiple output devices. Currently supported output targets include the +X Window System, win32, and image buffers. + +%package doc +Summary: Documentation for %{name} +Group: Documentation +Requires: %{name} = %{version}-%{release} + +%description doc +This package contains documentation for %{name}. + +%package -n ruby-%{gemname} +Summary: Non-Gem support package for %{gemname} +Group: Development/Languages +Requires: %{name} = %{version}-%{release} +Provides: ruby(%{gemname}) = %{version}-%{release} + +%description -n ruby-%{gemname} +This package provides non-Gem support for %{gemname}. + +%package devel +Summary: Ruby-cairo development environment +Group: Development/Languages +Requires: %{name} = %{version}-%{release} +Requires: cairo-devel +Requires: ruby-devel +# Obsoletes / Provides +# ruby(cairo-devel) Provides is for compatibility +Obsoletes: ruby-cairo-devel < 1.9 +Provides: ruby-cairo-devel = %{version}-%{release} +Provides: ruby(cairo-devel) = %{version}-%{release} + +%description devel +Header files and libraries for building a extension library for the +ruby-cairo +%prep +%setup -q -T -c + +mkdir -p ./%{gemdir} +export CONFIGURE_ARGS="--with-cflags='%{optflags}'" +gem install \ + --local \ + --install-dir ./%{gemdir} \ + -V --force \ + %{SOURCE0} + +# Install ext/cairo/depend +pushd .%{geminstdir} +cp -p %{SOURCE100} ext/cairo/depend + +%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 + +pushd .%{geminstdir} +# only create Makefile +export CFLAGS="%{optflags}" +ruby ./extconf.rb +popd + +%install +rm -rf %{buildroot} +mkdir -p %{buildroot}%{gemdir} +cp -a ./%{gemdir}/* %{buildroot}%{gemdir} + +# Install C extensions, header files +pushd .%{geminstdir} +make -C ext/cairo \ + install \ + INSTALL="install -p" \ + DESTDIR=%{buildroot}/ + +# remove all shebang, set permission to 0644 +for f in $(find %{buildroot}%{geminstdir} -name \*.rb) +do + sed -i -e '/^#!/d' $f + chmod 0644 $f +done + +# cleanups +rm -rf %{buildroot}%{geminstdir}/ext/ +rm -f %{buildroot}%{geminstdir}/lib/*.so + +rm -f %{buildroot}%{geminstdir}/{Makefile*,extconf.rb} + +# The following method is completely copied from rubygem-gettext +# spec file +# +# Create symlinks +## +## Note that before switching to gem %%{ruby_sitelib}/%%{gemname} +## already existed as a directory, so this cannot be replaced +## by symlink (cpio fails) +## Similarly, all directories under %%{ruby_sitelib} cannot be +## replaced by symlink +# + +create_symlink_rec(){ + +ORIGBASEDIR=$1 +TARGETBASEDIR=$2 + +## First calculate relative path of ORIGBASEDIR +## from TARGETBASEDIR +TMPDIR=$TARGETBASEDIR +BACKDIR= +DOWNDIR= +num=0 +nnum=0 +while true +do + num=$((num+1)) + TMPDIR=$(echo $TMPDIR | sed -e 's|/[^/][^/]*$||') + DOWNDIR=$(echo $ORIGBASEDIR | sed -e "s|^$TMPDIR||") + if [ x$DOWNDIR != x$ORIGBASEDIR ] + then + nnum=0 + while [ $nnum -lt $num ] + do + BACKDIR="../$BACKDIR" + nnum=$((nnum+1)) + done + break + fi +done + +RELBASEDIR=$( echo $BACKDIR/$DOWNDIR | sed -e 's|//*|/|g' ) + +## Next actually create symlink +pushd %{buildroot}/$ORIGBASEDIR +find . -type f | while read f +do + DIRNAME=$(dirname $f) + BACK2DIR=$(echo $DIRNAME | sed -e 's|/[^/][^/]*|/..|g') + mkdir -p %{buildroot}${TARGETBASEDIR}/$DIRNAME + LNNAME=$(echo $BACK2DIR/$RELBASEDIR/$f | \ + sed -e 's|^\./||' | sed -e 's|//|/|g' | \ + sed -e 's|/\./|/|' ) + ln -s -f $LNNAME %{buildroot}${TARGETBASEDIR}/$f +done +popd + +} + +create_symlink_rec %{geminstdir}/lib %{ruby_sitelib} + +%clean +rm -rf %{buildroot} + +%check +pushd ./%{geminstdir} +ruby ./test/run-test.rb --verbose +popd + +%files +%defattr(-,root, root,-) +%{ruby_sitearch}/%{gemname}.so +%dir %{geminstdir}/ +%doc %{geminstdir}/[A-Z]* +%exclude %{geminstdir}/Rakefile +%{geminstdir}/lib/ +%{gemdir}/cache/%{gemname}-%{version}.gem +%{gemdir}/specifications/%{gemname}-%{version}.gemspec + +%files doc +%defattr(-,root,root,-) +%{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 +* Tue Oct 5 2010 Mamoru Tasaka 1.10.0-2 +- Install one font at BuildRequires for test + +* Sun Sep 19 2010 Mamoru Tasaka 1.10.0-1 +- Update to 1.10.0 + +* Fri Sep 3 2010 Mamoru Tasaka 1.8.5-2 +- Switch to gem +- Fix license tag + +* Thu Sep 2 2010 Mamoru Tasaka 1.8.5-1 +- Update to 1.8.5 + +* Wed Dec 16 2009 Allisson Azevedo 1.8.1-1 +- Update to 1.8.1 + +* Sun Jul 26 2009 Fedora Release Engineering - 1.8.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 1.8.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Jan 23 2009 Allisson Azevedo 1.8.0-2 +- Rebuild + +* Sun Oct 5 2008 Allisson Azevedo 1.8.0-1 +- Update to 1.8.0 + +* Tue Sep 9 2008 Allisson Azevedo 1.7.0-1 +- Update to 1.7.0 + +* Sun May 18 2008 Allisson Azevedo 1.6.1-1 +- Update to 1.6.1 + +* Mon Feb 25 2008 Allisson Azevedo 1.5.1-1 +- Update to 1.5.1 +- Update License for GPLv2+ + +* Mon Feb 18 2008 Fedora Release Engineering - 1.5.0-2 +- Autorebuild for GCC 4.3 + +* Mon Jun 11 2007 Allisson Azevedo 1.5.0-1 +- Update to 1.5.0 + +* Sun Mar 28 2007 Allisson Azevedo 1.4.1-2 +- Changed license for Ruby License/GPL +- Add ruby-devel for devel requires +- Changed main group for System Environment/Libraries +- Changed install for keep timestamps + +* Sun Mar 26 2007 Allisson Azevedo 1.4.1-1 +- Initial RPM release diff --git a/sources b/sources index e69de29..6e8e3f4 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +9511621d4fdb60e67c8b87f63e6d54d2 cairo-1.10.0.gem From 0734c70f29098bc3d30df59894b6e957ada0c477 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Sun, 31 Oct 2010 06:26:24 +0900 Subject: [PATCH 003/127] - Move C extension so that "require %gemname" works correctly --- rubygem-cairo.spec | 72 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 51 insertions(+), 21 deletions(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index b9e089d..333d1a3 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -14,7 +14,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gemname} Version: 1.10.0 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Languages License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ @@ -97,36 +97,52 @@ sed -i -e '/pkg-config/s|project\.extra_deps|project.extra_dev_deps|' \ sed -i -e '/pkg-config/s|add_runtime_dependency|add_development_dependency|' \ .%{gemdir}/specifications/%{gemname}-%{version}.gemspec -pushd .%{geminstdir} -# only create Makefile -export CFLAGS="%{optflags}" -ruby ./extconf.rb -popd +# Once install to TMPINSTDIR for %%check +rm -rf ./TMPINSTDIR +mkdir -p ./TMPINSTDIR/%{gemdir} +cp -a ./%{gemdir}/* ./TMPINSTDIR/%{gemdir} -%install -rm -rf %{buildroot} -mkdir -p %{buildroot}%{gemdir} -cp -a ./%{gemdir}/* %{buildroot}%{gemdir} - -# Install C extensions, header files +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=%{buildroot}/ + DESTDIR=$TOPDIR/TMPINSTDIR/ +popd -# remove all shebang, set permission to 0644 -for f in $(find %{buildroot}%{geminstdir} -name \*.rb) +## remove all shebang, set permission to 0644 +for f in $(find ./TMPINSTDIR/%{geminstdir} -name \*.rb) do sed -i -e '/^#!/d' $f chmod 0644 $f done -# cleanups -rm -rf %{buildroot}%{geminstdir}/ext/ -rm -f %{buildroot}%{geminstdir}/lib/*.so +# Move C extension library to some private directory +pushd ./TMPINSTDIR/%{geminstdir} +grep -rl '%{gemname}.so' . | \ + xargs sed -i \ + -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}/ +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}/ -rm -f %{buildroot}%{geminstdir}/{Makefile*,extconf.rb} # The following method is completely copied from rubygem-gettext # spec file @@ -193,13 +209,24 @@ create_symlink_rec %{geminstdir}/lib %{ruby_sitelib} rm -rf %{buildroot} %check -pushd ./%{geminstdir} +export RUBYLIB=$(pwd)/TMPINSTDIR/%{ruby_sitearch} + +pushd ./TMPINSTDIR/%{geminstdir} +# kill unneeded make process +rm -rf ./TMPBINDIR +mkdir ./TMPBINDIR +pushd ./TMPBINDIR +ln -sf /bin/true make +export PATH=$(pwd):$PATH +popd + ruby ./test/run-test.rb --verbose popd %files %defattr(-,root, root,-) -%{ruby_sitearch}/%{gemname}.so +%dir %{ruby_sitearch}/%{gemname}/ +%{ruby_sitearch}/%{gemname}/%{gemname}.so %dir %{geminstdir}/ %doc %{geminstdir}/[A-Z]* %exclude %{geminstdir}/Rakefile @@ -225,6 +252,9 @@ popd %{ruby_sitearch}/rb_cairo.h %changelog +* Sun Oct 31 2010 Mamoru Taska 1.10.0-3 +- Move C extension so that "require %%gemname" works correctly + * Tue Oct 5 2010 Mamoru Tasaka 1.10.0-2 - Install one font at BuildRequires for test From c4be65b1e91eae2d7689fab6c85465f8325529e7 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Thu, 4 Nov 2010 04:59:11 +0900 Subject: [PATCH 004/127] - Move C extension so that "require %gemname" works correctly --- rubygem-cairo.spec | 72 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 51 insertions(+), 21 deletions(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index b9e089d..333d1a3 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -14,7 +14,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gemname} Version: 1.10.0 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Languages License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ @@ -97,36 +97,52 @@ sed -i -e '/pkg-config/s|project\.extra_deps|project.extra_dev_deps|' \ sed -i -e '/pkg-config/s|add_runtime_dependency|add_development_dependency|' \ .%{gemdir}/specifications/%{gemname}-%{version}.gemspec -pushd .%{geminstdir} -# only create Makefile -export CFLAGS="%{optflags}" -ruby ./extconf.rb -popd +# Once install to TMPINSTDIR for %%check +rm -rf ./TMPINSTDIR +mkdir -p ./TMPINSTDIR/%{gemdir} +cp -a ./%{gemdir}/* ./TMPINSTDIR/%{gemdir} -%install -rm -rf %{buildroot} -mkdir -p %{buildroot}%{gemdir} -cp -a ./%{gemdir}/* %{buildroot}%{gemdir} - -# Install C extensions, header files +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=%{buildroot}/ + DESTDIR=$TOPDIR/TMPINSTDIR/ +popd -# remove all shebang, set permission to 0644 -for f in $(find %{buildroot}%{geminstdir} -name \*.rb) +## remove all shebang, set permission to 0644 +for f in $(find ./TMPINSTDIR/%{geminstdir} -name \*.rb) do sed -i -e '/^#!/d' $f chmod 0644 $f done -# cleanups -rm -rf %{buildroot}%{geminstdir}/ext/ -rm -f %{buildroot}%{geminstdir}/lib/*.so +# Move C extension library to some private directory +pushd ./TMPINSTDIR/%{geminstdir} +grep -rl '%{gemname}.so' . | \ + xargs sed -i \ + -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}/ +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}/ -rm -f %{buildroot}%{geminstdir}/{Makefile*,extconf.rb} # The following method is completely copied from rubygem-gettext # spec file @@ -193,13 +209,24 @@ create_symlink_rec %{geminstdir}/lib %{ruby_sitelib} rm -rf %{buildroot} %check -pushd ./%{geminstdir} +export RUBYLIB=$(pwd)/TMPINSTDIR/%{ruby_sitearch} + +pushd ./TMPINSTDIR/%{geminstdir} +# kill unneeded make process +rm -rf ./TMPBINDIR +mkdir ./TMPBINDIR +pushd ./TMPBINDIR +ln -sf /bin/true make +export PATH=$(pwd):$PATH +popd + ruby ./test/run-test.rb --verbose popd %files %defattr(-,root, root,-) -%{ruby_sitearch}/%{gemname}.so +%dir %{ruby_sitearch}/%{gemname}/ +%{ruby_sitearch}/%{gemname}/%{gemname}.so %dir %{geminstdir}/ %doc %{geminstdir}/[A-Z]* %exclude %{geminstdir}/Rakefile @@ -225,6 +252,9 @@ popd %{ruby_sitearch}/rb_cairo.h %changelog +* Sun Oct 31 2010 Mamoru Taska 1.10.0-3 +- Move C extension so that "require %%gemname" works correctly + * Tue Oct 5 2010 Mamoru Tasaka 1.10.0-2 - Install one font at BuildRequires for test From 6882fc9838fd0a6ec47a9ac30cb98d0ad58a2c28 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 9 Feb 2011 03:34:17 -0600 Subject: [PATCH 005/127] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 333d1a3..4071580 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -14,7 +14,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gemname} Version: 1.10.0 -Release: 3%{?dist} +Release: 4%{?dist} Group: Development/Languages License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ @@ -252,6 +252,9 @@ popd %{ruby_sitearch}/rb_cairo.h %changelog +* Wed Feb 09 2011 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Sun Oct 31 2010 Mamoru Taska 1.10.0-3 - Move C extension so that "require %%gemname" works correctly From 0f301274b3408fd17ce588e280de25e4c8abb77a Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Mon, 14 Feb 2011 03:28:21 +0900 Subject: [PATCH 006/127] - F-15 mass rebuild --- rubygem-cairo.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 4071580..dd4a5c9 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -27,11 +27,12 @@ BuildRequires: ruby(abi) = %{rubyabi} BuildRequires: ruby(rubygems) BuildRequires: cairo-devel BuildRequires: ruby-devel -BuildRequires(check): rubygem(test-unit) -BuildRequires(check): rubygem(pkg-config) +# For %%check +BuildRequires: rubygem(test-unit) +BuildRequires: rubygem(pkg-config) # Make sure at least one font is available for test/test_context.rb:57 # `initialize': out of memory (NoMemoryError) -BuildRequires(check): dejavu-serif-fonts +BuildRequires: dejavu-serif-fonts Requires: ruby(abi) = %{rubyabi} Requires: ruby(rubygems) Provides: rubygem(%{gemname}) = %{version}-%{release} @@ -252,8 +253,8 @@ popd %{ruby_sitearch}/rb_cairo.h %changelog -* Wed Feb 09 2011 Fedora Release Engineering -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild +* Mon Feb 14 2011 Mamoru Tasaka 1.10.0-4 +- F-15 mass rebuild * Sun Oct 31 2010 Mamoru Taska 1.10.0-3 - Move C extension so that "require %%gemname" works correctly From 2cdb9ba111f4aa0369b43bb29a133f99b0793e7a Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Mon, 14 Feb 2011 04:47:21 +0900 Subject: [PATCH 007/127] Ignore test failure for now --- rubygem-cairo.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index dd4a5c9..636b4a6 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -221,7 +221,10 @@ ln -sf /bin/true make export PATH=$(pwd):$PATH popd -ruby ./test/run-test.rb --verbose +# 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 popd %files @@ -255,6 +258,7 @@ popd %changelog * 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 - Move C extension so that "require %%gemname" works correctly From 0f58ea50d56c2a277c4c740198ee4aac9bf85549 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Fri, 2 Dec 2011 00:34:13 +0900 Subject: [PATCH 008/127] 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 From 367f525459b7230d1a7a61ac746f3bd36696bb9c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 21:05:28 -0600 Subject: [PATCH 009/127] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 6be25ef..6644380 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -12,7 +12,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gemname} Version: 1.10.2 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Languages License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ @@ -240,6 +240,9 @@ popd %{ruby_sitearch}/rb_cairo.h %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 1.10.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Wed Nov 30 2011 Mamoru Tasaka - 1.10.2-1 - 1.10.2 - Make dependency for pkg-config be development only again From 4937b90815cfd86dce941230ba7b62292c27d652 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Sun, 29 Jan 2012 02:57:25 +0900 Subject: [PATCH 010/127] F-17: rebuild against ruby 1.9 --- rubygem-cairo.spec | 144 ++++++++++++++++++++++++++++----------------- 1 file changed, 90 insertions(+), 54 deletions(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 6644380..7958b3c 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -1,25 +1,31 @@ +%if 0%{?fedora} <= 16 %global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']") %global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']") -%global rubyabi 1.8 +%endif -%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) -%global gemname cairo -%global geminstdir %{gemdir}/gems/%{gemname}-%{version} +%if 0%{?fedora} >= 17 +%global rubyabi 1.9.1 +%global header_dir %{ruby_vendorarchdir} +%else +%global rubyabi 1.8 +%global header_dir %{ruby_sitearch} +%endif +%global gem_name cairo # Upstream GIT http://github.com/rcairo/ Summary: Ruby bindings for cairo -Name: rubygem-%{gemname} +Name: rubygem-%{gem_name} Version: 1.10.2 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Languages License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ -Source0: http://rubygems.org/downloads/%{gemname}-%{version}.gem +Source0: http://rubygems.org/downloads/%{gem_name}-%{version}.gem BuildRequires: ruby(abi) = %{rubyabi} -BuildRequires: rubygems +BuildRequires: rubygems-devel BuildRequires: cairo-devel BuildRequires: ruby-devel # For %%check @@ -30,7 +36,12 @@ BuildRequires: rubygem(pkg-config) BuildRequires: dejavu-serif-fonts Requires: ruby(abi) = %{rubyabi} Requires: rubygems -Provides: rubygem(%{gemname}) = %{version}-%{release} +Provides: rubygem(%{gem_name}) = %{version}-%{release} + +%if 0%{?fedora} >= 17 +Obsoletes: ruby-%{gem_name} = %{version}-%{release} +Provides: ruby-%{gem_name} = %{version}-%{release} +%endif %description Ruby bindings for cairo. Cairo is a 2D graphics library with support for @@ -45,16 +56,16 @@ Requires: %{name} = %{version}-%{release} %description doc This package contains documentation for %{name}. -%package -n ruby-%{gemname} -# TODO: remove ruby-%%{gemname} compat package for F-17 +%package -n ruby-%{gem_name} +# TODO: remove ruby-%%{gem_name} compat package for F-17 # TODO: needs dependency check -Summary: Non-Gem support package for %{gemname} +Summary: Non-Gem support package for %{gem_name} Group: Development/Languages Requires: %{name} = %{version}-%{release} -Provides: ruby(%{gemname}) = %{version}-%{release} +Provides: ruby(%{gem_name}) = %{version}-%{release} -%description -n ruby-%{gemname} -This package provides non-Gem support for %{gemname}. +%description -n ruby-%{gem_name} +This package provides non-Gem support for %{gem_name}. %package devel Summary: Ruby-cairo development environment @@ -80,11 +91,11 @@ ruby-cairo %prep %setup -q -T -c -mkdir -p ./%{gemdir} +mkdir -p ./%{gem_dir} export CONFIGURE_ARGS="--with-cflags='%{optflags}'" gem install \ --local \ - --install-dir ./%{gemdir} \ + --install-dir ./%{gem_dir} \ -V --force \ %{SOURCE0} @@ -97,40 +108,48 @@ find . -name \*.gemspec | \ # Once install to TMPINSTDIR for %%check rm -rf ./TMPINSTDIR -mkdir -p ./TMPINSTDIR/%{gemdir} -cp -a ./%{gemdir}/* ./TMPINSTDIR/%{gemdir} +mkdir -p ./TMPINSTDIR/%{gem_dir} +cp -a ./%{gem_dir}/* ./TMPINSTDIR/%{gem_dir} TOPDIR=$(pwd) ## remove all shebang, set permission to 0644 -for f in $(find ./TMPINSTDIR/%{geminstdir} -name \*.rb) +for f in $(find ./TMPINSTDIR/%{gem_instdir} -name \*.rb) do sed -i -e '/^#!/d' $f chmod 0644 $f done # Move C extension library to some private directory -pushd ./TMPINSTDIR/%{geminstdir} -grep -rl '%{gemname}.so' . | \ +pushd ./TMPINSTDIR/%{gem_instdir} +%if 0%{?fedora} < 17 +grep -rl '%{gem_name}.so' . | \ xargs sed -i \ - -e "\@require@s|'%{gemname}.so'|'%{gemname}/%{gemname}.so'|" \ - -e '\@require@s|"%{gemname}.so"|"%{gemname}/%{gemname}.so"|' + -e "\@require@s|'%{gem_name}.so'|'%{gem_name}/%{gem_name}.so'|" \ + -e '\@require@s|"%{gem_name}.so"|"%{gem_name}/%{gem_name}.so"|' popd -mkdir -p ./TMPINSTDIR/%{ruby_sitearch}/%{gemname} +mkdir -p ./TMPINSTDIR/%{ruby_sitearch}/%{gem_name} pushd ./TMPINSTDIR -mv .%{geminstdir}/lib/%{gemname}.so \ - ./%{ruby_sitearch}/%{gemname}/ +mv .%{gem_instdir}/lib/%{gem_name}.so \ + ./%{ruby_sitearch}/%{gem_name}/ +%else +popd +pushd ./TMPINSTDIR +mkdir -p .%{gem_extdir}/lib +mv .%{gem_instdir}/lib/%{gem_name}.so \ + ./%{gem_extdir}/lib +%endif # Move header -mv ./%{geminstdir}/lib/*.h \ - ./%{ruby_sitearch}/ - +mkdir -p ./%{header_dir} +mv ./%{gem_instdir}/lib/*.h \ + ./%{header_dir}/ popd # cleanups -rm -rf ./TMPINSTDIR/%{geminstdir}/ext/ -rm -f ./TMPINSTDIR/%{geminstdir}/{Makefile*,extconf.rb} +rm -rf ./TMPINSTDIR/%{gem_instdir}/ext/ +rm -f ./TMPINSTDIR/%{gem_instdir}/{Makefile*,extconf.rb} %install cp -a ./TMPINSTDIR/* %{buildroot}/ @@ -140,7 +159,7 @@ cp -a ./TMPINSTDIR/* %{buildroot}/ # # Create symlinks ## -## Note that before switching to gem %%{ruby_sitelib}/%%{gemname} +## Note that before switching to gem %%{ruby_sitelib}/%%{gem_name} ## already existed as a directory, so this cannot be replaced ## by symlink (cpio fails) ## Similarly, all directories under %%{ruby_sitelib} cannot be @@ -194,12 +213,18 @@ popd } -create_symlink_rec %{geminstdir}/lib %{ruby_sitelib} +%if 0%{?fedora} < 17 +create_symlink_rec %{gem_instdir}/lib %{ruby_sitelib} +%endif %check +%if 0%{?fedora} >= 17 +export RUBYLIB=$(pwd)/TMPINSTDIR/%{gem_instdir}:$(pwd)/TMPINSTDIR/%{gem_extdir}/lib +%else export RUBYLIB=$(pwd)/TMPINSTDIR/%{ruby_sitearch} +%endif -pushd ./TMPINSTDIR/%{geminstdir} +pushd ./TMPINSTDIR/%{gem_instdir} # kill unneeded make process rm -rf ./TMPBINDIR mkdir ./TMPBINDIR @@ -215,31 +240,42 @@ ruby ./test/run-test.rb popd %files -%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 +%if 0%{fedora} < 17 +%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 +%endif +%dir %{gem_instdir}/ +%doc %{gem_instdir}/[A-Z]* +%exclude %{gem_instdir}/Gemfile +%exclude %{gem_instdir}/Rakefile +%{gem_instdir}/lib/ +%{gem_cache} +%{gem_spec} %files doc -%{geminstdir}/Gemfile -%{geminstdir}/Rakefile -%{geminstdir}/samples/ -%{geminstdir}/test/ -%{gemdir}/doc/%{gemname}-%{version}/ +%{gem_instdir}/Gemfile +%{gem_instdir}/Rakefile +%{gem_instdir}/samples/ +%{gem_instdir}/test/ +%{gem_docdir}/ -%files -n ruby-%{gemname} -%{ruby_sitelib}/%{gemname}.rb -%{ruby_sitelib}/%{gemname}/ +%if 0%{?fedora} < 17 +%files -n ruby-%{gem_name} +%{ruby_sitelib}/%{gem_name}.rb +%{ruby_sitelib}/%{gem_name}/ +%endif %files devel -%{ruby_sitearch}/rb_cairo.h +%{header_dir}/rb_cairo.h %changelog +* Sun Jan 29 2012 Mamoru Tasaka - 1.10.2-3 +- F-17: rebuild against ruby 1.9 + * Sat Jan 14 2012 Fedora Release Engineering - 1.10.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild @@ -257,7 +293,7 @@ popd - Ignore test failure for now * Sun Oct 31 2010 Mamoru Tasaka 1.10.0-3 -- Move C extension so that "require %%gemname" works correctly +- Move C extension so that "require %%gem_name" works correctly * Tue Oct 5 2010 Mamoru Tasaka 1.10.0-2 - Install one font at BuildRequires for test From 192dce8dd244ad6480af82b02ec84570fb5765cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 3 Apr 2012 14:59:13 +0200 Subject: [PATCH 011/127] Fix conditionals for F17 to work for RHEL 7 as well. --- cairo-1.10.0-ext.cairo.depend | 2 -- rubygem-cairo.spec | 23 ++++++++++++++--------- 2 files changed, 14 insertions(+), 11 deletions(-) delete mode 100644 cairo-1.10.0-ext.cairo.depend diff --git a/cairo-1.10.0-ext.cairo.depend b/cairo-1.10.0-ext.cairo.depend deleted file mode 100644 index d267ff6..0000000 --- a/cairo-1.10.0-ext.cairo.depend +++ /dev/null @@ -1,2 +0,0 @@ -install-so: - $(INSTALL_DATA) $(srcdir)/rb_cairo.h $(RUBYARCHDIR) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 7958b3c..154bb5e 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -3,12 +3,14 @@ %global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']") %endif -%if 0%{?fedora} >= 17 +%if %{?fedora:0%{fedora} >= 17}%{?rhel:0%{rhel} >= 7} %global rubyabi 1.9.1 %global header_dir %{ruby_vendorarchdir} +%global ruby19 1 %else %global rubyabi 1.8 %global header_dir %{ruby_sitearch} +%global ruby19 0 %endif %global gem_name cairo @@ -18,7 +20,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: 1.10.2 -Release: 3%{?dist} +Release: 4%{?dist} Group: Development/Languages License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ @@ -38,7 +40,7 @@ Requires: ruby(abi) = %{rubyabi} Requires: rubygems Provides: rubygem(%{gem_name}) = %{version}-%{release} -%if 0%{?fedora} >= 17 +%if %{ruby19} Obsoletes: ruby-%{gem_name} = %{version}-%{release} Provides: ruby-%{gem_name} = %{version}-%{release} %endif @@ -80,7 +82,7 @@ Requires: ruby-devel # Remove on F-17 and above Obsoletes: ruby-cairo-devel < 1.9 Provides: ruby-cairo-devel = %{version}-%{release} -%if 0%{?fedora} < 17 +%if %{ruby19} < 1 Provides: ruby(cairo-devel) = %{version}-%{release} %endif @@ -122,7 +124,7 @@ done # Move C extension library to some private directory pushd ./TMPINSTDIR/%{gem_instdir} -%if 0%{?fedora} < 17 +%if %{ruby19} < 1 grep -rl '%{gem_name}.so' . | \ xargs sed -i \ -e "\@require@s|'%{gem_name}.so'|'%{gem_name}/%{gem_name}.so'|" \ @@ -213,12 +215,12 @@ popd } -%if 0%{?fedora} < 17 +%if %{ruby19} < 1 create_symlink_rec %{gem_instdir}/lib %{ruby_sitelib} %endif %check -%if 0%{?fedora} >= 17 +%if %{ruby19} export RUBYLIB=$(pwd)/TMPINSTDIR/%{gem_instdir}:$(pwd)/TMPINSTDIR/%{gem_extdir}/lib %else export RUBYLIB=$(pwd)/TMPINSTDIR/%{ruby_sitearch} @@ -240,7 +242,7 @@ ruby ./test/run-test.rb popd %files -%if 0%{fedora} < 17 +%if %{ruby19} < 1 %dir %{ruby_sitearch}/%{gem_name}/ %{ruby_sitearch}/%{gem_name}/%{gem_name}.so %else @@ -263,7 +265,7 @@ popd %{gem_instdir}/test/ %{gem_docdir}/ -%if 0%{?fedora} < 17 +%if %{ruby19} < 1 %files -n ruby-%{gem_name} %{ruby_sitelib}/%{gem_name}.rb %{ruby_sitelib}/%{gem_name}/ @@ -273,6 +275,9 @@ popd %{header_dir}/rb_cairo.h %changelog +* Tue Apr 03 2012 Vít Ondruch - 1.10.2-4 +- Fix conditionals for F17 to work for RHEL 7 as well. + * Sun Jan 29 2012 Mamoru Tasaka - 1.10.2-3 - F-17: rebuild against ruby 1.9 From daa600f9198350c4e743a2c07fabb1034aa5f0c2 Mon Sep 17 00:00:00 2001 From: TASAKA Mamoru Date: Wed, 18 Apr 2012 18:42:50 +0900 Subject: [PATCH 012/127] 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 779a3c19e87a9d2e34cce6a0d90c13090e4acc69 Mon Sep 17 00:00:00 2001 From: TASAKA Mamoru Date: Wed, 18 Apr 2012 18:43:32 +0900 Subject: [PATCH 013/127] 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 befd0ef0899cd69c4409d4b19319764226d9704f Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Wed, 18 Apr 2012 20:18:45 +0900 Subject: [PATCH 014/127] 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 dcc9bdda292d4b5fa711cc6e89a2030deb4f3f0e Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Wed, 18 Apr 2012 20:19:26 +0900 Subject: [PATCH 015/127] 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 0324870e67d0a6a0bdd7d8ff967853aea43adb35 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 12:40:46 -0500 Subject: [PATCH 016/127] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 7ebe0df..fa09ff6 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: 0.1.git%{gem_githash}%{?dist} +Release: 0.2.git%{gem_githash}%{?dist} Group: Development/Languages License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ @@ -285,6 +285,9 @@ popd %{header_dir}/rb_cairo.h %changelog +* 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 From 4fe259a3f19cdd87c91652a1772a03d81db8fc22 Mon Sep 17 00:00:00 2001 From: TASAKA Mamoru Date: Thu, 6 Sep 2012 14:41:28 +0900 Subject: [PATCH 017/127] Update to 1.12.2 formal --- .gitignore | 1 + rubygem-cairo.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 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 fa09ff6..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.2.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,9 @@ 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 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 f4114ac30620c3510812da8aefb24657c57bd926 Mon Sep 17 00:00:00 2001 From: TASAKA Mamoru Date: Thu, 6 Sep 2012 14:41:51 +0900 Subject: [PATCH 018/127] Update to 1.12.2 formal --- .gitignore | 1 + rubygem-cairo.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 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 fa09ff6..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.2.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,9 @@ 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 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 6718b2a74a9d9afca8e545e0ec67eea31b6c94c4 Mon Sep 17 00:00:00 2001 From: TASAKA Mamoru Date: Thu, 6 Sep 2012 14:42:03 +0900 Subject: [PATCH 019/127] 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 87ca3e69fa13c8490977b75b62b03cb85fade36d Mon Sep 17 00:00:00 2001 From: TASAKA Mamoru Date: Thu, 6 Dec 2012 13:25:55 +0900 Subject: [PATCH 020/127] 1.12.3 --- rubygem-cairo.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 1d892d8..5a02ffb 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -3,7 +3,7 @@ %global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']") %endif -%if %{?fedora:0%{fedora} >= 17}%{?rhel:0%{rhel} >= 7} +%if %{?fedora:0%{fedora} >= 17} || %{?rhel:0%{rhel} >= 7} %global rubyabi 1.9.1 %global header_dir %{ruby_vendorarchdir} %global ruby19 1 @@ -14,7 +14,7 @@ %endif %global gem_name cairo -%global gemver 1.12.2 +%global gemver 1.12.3 #%%global gem_githash af3e3fc059 # Upstream GIT http://github.com/rcairo/ @@ -49,7 +49,7 @@ Requires: rubygems Provides: rubygem(%{gem_name}) = %{version}-%{release} %if %{ruby19} -Obsoletes: ruby-%{gem_name} = %{version}-%{release} +Obsoletes: ruby-%{gem_name} <= %{version}-%{release} Provides: ruby-%{gem_name} = %{version}-%{release} %endif @@ -285,6 +285,9 @@ popd %{header_dir}/rb_cairo.h %changelog +* Thu Oct 6 2012 Mamoru TASAKA - 1.12.3-1 +- 1.12.3 + * Thu Sep 6 2012 Mamoru Tasaka - 1.12.2-1 - Update to 1.12.2 formal From 779d1411ab1d084e3e8d2321a57a9befad7ef02d Mon Sep 17 00:00:00 2001 From: TASAKA Mamoru Date: Thu, 6 Dec 2012 13:38:19 +0900 Subject: [PATCH 021/127] change boolean expression --- rubygem-cairo.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 5a02ffb..b88bdd4 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -3,7 +3,7 @@ %global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']") %endif -%if %{?fedora:0%{fedora} >= 17} || %{?rhel:0%{rhel} >= 7} +%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 %global rubyabi 1.9.1 %global header_dir %{ruby_vendorarchdir} %global ruby19 1 From fb267c1a02fa88ee13763424e02efe064a0f80aa Mon Sep 17 00:00:00 2001 From: TASAKA Mamoru Date: Thu, 6 Dec 2012 13:40:57 +0900 Subject: [PATCH 022/127] upload new gem --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 497e28f..3751138 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /cairo-1.10.2.gem /cairo-1.12.2-af3e3fc059.gem /cairo-1.12.2.gem +/cairo-1.12.3.gem diff --git a/sources b/sources index cc0aba0..f8e3a8d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -94897684caf2e17dac084f4573e46d5f cairo-1.12.2.gem +f759a4d2a00e7fca6ab44b44d3461558 cairo-1.12.3.gem From fb8c19a8e2a85a70ac92335e01a6dda3d9ec1c87 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 16:18:09 -0600 Subject: [PATCH 023/127] - 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 024/127] 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 025/127] 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 026/127] 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 027/127] 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 028/127] 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 From d76dfc1390b65fdaf83e516dd06110988e5e1f77 Mon Sep 17 00:00:00 2001 From: TASAKA Mamoru Date: Wed, 27 Mar 2013 12:46:49 +0900 Subject: [PATCH 029/127] Rebuild due to wrong %gem_extdir_mri macro (bug 927471) --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 6133add..ae6c764 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: 1%{?dist} +Release: 1%{?dist}.1 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 26 2013 Mamoru TASAKA +- Rebuild due to wrong %%gem_extdir_mri macro (bug 927471) + * Tue Mar 19 2013 Mamoru TASAKA - 1.12.4-1 - 1.12.4 From c02d849a28803e2e7c36fddf740bb59198e01256 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 08:33:57 -0500 Subject: [PATCH 030/127] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 6133add..f01f082 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: 1%{?dist} +Release: 2%{?dist} Group: Development/Languages License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ @@ -291,6 +291,9 @@ popd %{header_dir}/rb_cairo.h %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 1.12.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Tue Mar 19 2013 Mamoru TASAKA - 1.12.4-1 - 1.12.4 From 1d81d3915bb5232c5cb7947657ad2968dda9a63c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 6 Aug 2013 16:34:32 +0900 Subject: [PATCH 031/127] 1.12.6 --- rubygem-cairo.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index f01f082..a734842 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -16,7 +16,7 @@ %endif %global gem_name cairo -%global gemver 1.12.4 +%global gemver 1.12.6 #%%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: 2%{?dist} +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 Aug 6 2013 Mamoru TASAKA - 1.12.6-1 +- 1.12.6 + * Sun Aug 04 2013 Fedora Release Engineering - 1.12.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 5013905b5fc7f290c7f363067fa4a2dd5f0a666c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 6 Aug 2013 16:36:08 +0900 Subject: [PATCH 032/127] merge conflict fix --- rubygem-cairo.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index a734842..8d8f13d 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -297,6 +297,9 @@ popd * Sun Aug 04 2013 Fedora Release Engineering - 1.12.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild +* Tue Mar 26 2013 Mamoru TASAKA +- Rebuild due to wrong %%gem_extdir_mri macro (bug 927471) + * Tue Mar 19 2013 Mamoru TASAKA - 1.12.4-1 - 1.12.4 From 4ffd477a022dfc7779f567b2fb8e505ae0e0e5c0 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 6 Aug 2013 16:38:33 +0900 Subject: [PATCH 033/127] upload source --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2ca1445..f147169 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /cairo-1.12.2.gem /cairo-1.12.3.gem /cairo-1.12.4.gem +/cairo-1.12.6.gem diff --git a/sources b/sources index 75d258a..0cb2882 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -003085c8af34fd0a2e6a01d7096091dd cairo-1.12.4.gem +daa10e878eab81c1b5bcd74e511d5550 cairo-1.12.6.gem From 9032ed5308ea293ae10360a16e178871c6e63a13 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 30 Dec 2013 15:39:01 +0900 Subject: [PATCH 034/127] 1.12.8 --- .gitignore | 1 + rubygem-cairo.spec | 137 ++++----------------------------------------- sources | 2 +- 3 files changed, 13 insertions(+), 127 deletions(-) diff --git a/.gitignore b/.gitignore index f147169..fbfaf55 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /cairo-1.12.3.gem /cairo-1.12.4.gem /cairo-1.12.6.gem +/cairo-1.12.8.gem diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 8d8f13d..c966997 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -1,22 +1,7 @@ -%if 0%{?fedora} <= 16 -%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']") -%global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']") -%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 -%global rubyabi 1.8 -%global header_dir %{ruby_sitearch} -%global ruby19 0 -%endif %global gem_name cairo -%global gemver 1.12.6 +%global gemver 1.12.8 #%%global gem_githash af3e3fc059 # Upstream GIT http://github.com/rcairo/ @@ -58,10 +43,8 @@ BuildRequires: dejavu-serif-fonts Requires: rubygems Provides: rubygem(%{gem_name}) = %{version}-%{release} -%if %{ruby19} Obsoletes: ruby-%{gem_name} <= %{version}-%{release} Provides: ruby-%{gem_name} = %{version}-%{release} -%endif %description Ruby bindings for cairo. Cairo is a 2D graphics library with support for @@ -76,17 +59,6 @@ Requires: %{name} = %{version}-%{release} %description doc This package contains documentation for %{name}. -%package -n ruby-%{gem_name} -# TODO: remove ruby-%%{gem_name} compat package for F-17 -# TODO: needs dependency check -Summary: Non-Gem support package for %{gem_name} -Group: Development/Languages -Requires: %{name} = %{version}-%{release} -Provides: ruby(%{gem_name}) = %{version}-%{release} - -%description -n ruby-%{gem_name} -This package provides non-Gem support for %{gem_name}. - %package devel Summary: Ruby-cairo development environment Group: Development/Languages @@ -96,13 +68,10 @@ Requires: ruby-devel # Obsoletes / Provides # ruby(cairo-devel) Provides is for compatibility # -# Actually ruby(cairo-dock) provides should not exist - +# Actually ruby(cairo-devel) provides should not exist - # Remove on F-17 and above Obsoletes: ruby-cairo-devel < 1.9 Provides: ruby-cairo-devel = %{version}-%{release} -%if %{ruby19} < 1 -Provides: ruby(cairo-devel) = %{version}-%{release} -%endif %description devel Header files and libraries for building a extension library for the @@ -136,25 +105,11 @@ do chmod 0644 $f done -# Move C extension library to some private directory -pushd ./TMPINSTDIR/%{gem_instdir} -%if %{ruby19} < 1 -grep -rl '%{gem_name}.so' . | \ - xargs sed -i \ - -e "\@require@s|'%{gem_name}.so'|'%{gem_name}/%{gem_name}.so'|" \ - -e '\@require@s|"%{gem_name}.so"|"%{gem_name}/%{gem_name}.so"|' -popd -mkdir -p ./TMPINSTDIR/%{ruby_sitearch}/%{gem_name} -pushd ./TMPINSTDIR -mv .%{gem_instdir}/lib/%{gem_name}.so \ - ./%{ruby_sitearch}/%{gem_name}/ -%else -popd +# Move C extension pushd ./TMPINSTDIR mkdir -p .%{gem_extdir_mri}/lib mv .%{gem_instdir}/lib/%{gem_name}.so \ ./%{gem_extdir_mri}/lib -%endif # Move header mkdir -p ./%{header_dir} @@ -170,75 +125,8 @@ rm -f ./TMPINSTDIR/%{gem_instdir}/{Makefile*,extconf.rb} %install cp -a ./TMPINSTDIR/* %{buildroot}/ -# The following method is completely copied from rubygem-gettext -# spec file -# -# Create symlinks -## -## Note that before switching to gem %%{ruby_sitelib}/%%{gem_name} -## already existed as a directory, so this cannot be replaced -## by symlink (cpio fails) -## Similarly, all directories under %%{ruby_sitelib} cannot be -## replaced by symlink -# - -create_symlink_rec(){ - -ORIGBASEDIR=$1 -TARGETBASEDIR=$2 - -## First calculate relative path of ORIGBASEDIR -## from TARGETBASEDIR -TMPDIR=$TARGETBASEDIR -BACKDIR= -DOWNDIR= -num=0 -nnum=0 -while true -do - num=$((num+1)) - TMPDIR=$(echo $TMPDIR | sed -e 's|/[^/][^/]*$||') - DOWNDIR=$(echo $ORIGBASEDIR | sed -e "s|^$TMPDIR||") - if [ x$DOWNDIR != x$ORIGBASEDIR ] - then - nnum=0 - while [ $nnum -lt $num ] - do - BACKDIR="../$BACKDIR" - nnum=$((nnum+1)) - done - break - fi -done - -RELBASEDIR=$( echo $BACKDIR/$DOWNDIR | sed -e 's|//*|/|g' ) - -## Next actually create symlink -pushd %{buildroot}/$ORIGBASEDIR -find . -type f | while read f -do - DIRNAME=$(dirname $f) - BACK2DIR=$(echo $DIRNAME | sed -e 's|/[^/][^/]*|/..|g') - mkdir -p %{buildroot}${TARGETBASEDIR}/$DIRNAME - LNNAME=$(echo $BACK2DIR/$RELBASEDIR/$f | \ - sed -e 's|^\./||' | sed -e 's|//|/|g' | \ - sed -e 's|/\./|/|' ) - ln -s -f $LNNAME %{buildroot}${TARGETBASEDIR}/$f -done -popd - -} - -%if %{ruby19} < 1 -create_symlink_rec %{gem_instdir}/lib %{ruby_sitelib} -%endif - %check -%if %{ruby19} export RUBYLIB=$(pwd)/TMPINSTDIR/%{gem_instdir}:$(pwd)/TMPINSTDIR/%{gem_extdir_mri}/lib -%else -export RUBYLIB=$(pwd)/TMPINSTDIR/%{ruby_sitearch} -%endif pushd ./TMPINSTDIR/%{gem_instdir} # kill unneeded make process @@ -258,20 +146,20 @@ ruby ./test/run-test.rb popd %files -%if %{ruby19} < 1 -%dir %{ruby_sitearch}/%{gem_name}/ -%{ruby_sitearch}/%{gem_name}/%{gem_name}.so -%else %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]* %exclude %{gem_instdir}/Gemfile %exclude %{gem_instdir}/Rakefile %{gem_instdir}/lib/ +%if 0%{?fedora} >= 20 +%exclude %{gem_cache} +%else %{gem_cache} +%endif %{gem_spec} %files doc @@ -281,16 +169,13 @@ popd %{gem_instdir}/test/ %{gem_docdir}/ -%if %{ruby19} < 1 -%files -n ruby-%{gem_name} -%{ruby_sitelib}/%{gem_name}.rb -%{ruby_sitelib}/%{gem_name}/ -%endif - %files devel %{header_dir}/rb_cairo.h %changelog +* Mon Dec 30 2013 Mamoru TASAKA - 1.12.8-1 +- 1.12.8 + * Tue Aug 6 2013 Mamoru TASAKA - 1.12.6-1 - 1.12.6 diff --git a/sources b/sources index 0cb2882..42bbcb2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -daa10e878eab81c1b5bcd74e511d5550 cairo-1.12.6.gem +f5f7e431add0f3ded7a3d3ad6df64274 cairo-1.12.8.gem From b50c19b4381530bfb1d1f1a816b3bfa2844c7e87 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 9 Apr 2014 18:28:18 +0900 Subject: [PATCH 035/127] 1.12.9 --- .gitignore | 1 + rubygem-cairo.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index fbfaf55..0b81b42 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /cairo-1.12.4.gem /cairo-1.12.6.gem /cairo-1.12.8.gem +/cairo-1.12.9.gem diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index c966997..64dc850 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -1,7 +1,7 @@ %global header_dir %{ruby_vendorarchdir} %global gem_name cairo -%global gemver 1.12.8 +%global gemver 1.12.9 #%%global gem_githash af3e3fc059 # Upstream GIT http://github.com/rcairo/ @@ -173,6 +173,9 @@ popd %{header_dir}/rb_cairo.h %changelog +* Wed Apr 9 2014 Mamoru TASAKA - 1.12.9-1 +- 1.12.9 + * Mon Dec 30 2013 Mamoru TASAKA - 1.12.8-1 - 1.12.8 diff --git a/sources b/sources index 42bbcb2..df777b6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f5f7e431add0f3ded7a3d3ad6df64274 cairo-1.12.8.gem +77641cdb2ae505fde9c254d5e5e1b36c cairo-1.12.9.gem From d687ce57b5231fdc226eb84a15e3db290277ca98 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 16 Apr 2014 18:21:53 +0900 Subject: [PATCH 036/127] F-21: rebuild for ruby 2.1 / rubygems 2.2 --- rubygem-cairo.spec | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 64dc850..ae51db0 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -9,7 +9,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/ @@ -106,6 +106,18 @@ do done # Move C extension +%if 0%{?fedora} >= 21 +mkdir -p ./TMPINSTDIR/%{gem_extdir_mri} +cp -a ./%{gem_extdir_mri}/* TMPINSTDIR/%{gem_extdir_mri}/ + +pushd ./TMPINSTDIR +mkdir -p .%{header_dir} +mv .%{gem_extdir_mri}/*.h .%{header_dir}/ +rm -f .%{gem_extdir_mri}/{gem_make.out,mkmf.log} + +popd + +%else pushd ./TMPINSTDIR mkdir -p .%{gem_extdir_mri}/lib mv .%{gem_instdir}/lib/%{gem_name}.so \ @@ -116,6 +128,7 @@ mkdir -p ./%{header_dir} mv ./%{gem_instdir}/lib/*.h \ ./%{header_dir}/ popd +%endif # cleanups @@ -126,7 +139,11 @@ rm -f ./TMPINSTDIR/%{gem_instdir}/{Makefile*,extconf.rb} cp -a ./TMPINSTDIR/* %{buildroot}/ %check +%if 0%{?fedora} >= 21 +export RUBYLIB=$(pwd)/TMPINSTDIR/%{gem_instdir}:$(pwd)/TMPINSTDIR/%{gem_extdir_mri}/ +%else export RUBYLIB=$(pwd)/TMPINSTDIR/%{gem_instdir}:$(pwd)/TMPINSTDIR/%{gem_extdir_mri}/lib +%endif pushd ./TMPINSTDIR/%{gem_instdir} # kill unneeded make process @@ -146,9 +163,13 @@ ruby ./test/run-test.rb popd %files +%if 0%{?fedora} >= 21 +%{gem_extdir_mri}/ +%else %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]* @@ -173,6 +194,9 @@ popd %{header_dir}/rb_cairo.h %changelog +* Wed Apr 16 2014 Mamoru TASAKA - 1.12.9-2 +- F-21: rebuild for ruby 2.1 / rubygems 2.2 + * Wed Apr 9 2014 Mamoru TASAKA - 1.12.9-1 - 1.12.9 From 4dae2ce61b5af25829f020813a0fb01dfac0f246 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 22:35:25 -0500 Subject: [PATCH 037/127] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index ae51db0..a6aa419 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -9,7 +9,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/ @@ -194,6 +194,9 @@ popd %{header_dir}/rb_cairo.h %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 1.12.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Wed Apr 16 2014 Mamoru TASAKA - 1.12.9-2 - F-21: rebuild for ruby 2.1 / rubygems 2.2 From 7fddfda95f4a15407a27aa0d2ed7ff9acfbc9fe6 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 00:36:08 +0000 Subject: [PATCH 038/127] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index a6aa419..3952b88 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -9,7 +9,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 3%{?dist} +Release: 4%{?dist} Group: Development/Languages License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ @@ -194,6 +194,9 @@ popd %{header_dir}/rb_cairo.h %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 1.12.9-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 1.12.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 91a08782057e1fe7f03fd251abb276fa389ea804 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 25 Nov 2014 21:25:08 +0900 Subject: [PATCH 039/127] 1.14.0 --- .gitignore | 1 + rubygem-cairo.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0b81b42..1e9da4e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /cairo-1.12.6.gem /cairo-1.12.8.gem /cairo-1.12.9.gem +/cairo-1.14.0.gem diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 3952b88..de2c63c 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -1,7 +1,7 @@ %global header_dir %{ruby_vendorarchdir} %global gem_name cairo -%global gemver 1.12.9 +%global gemver 1.14.0 #%%global gem_githash af3e3fc059 # Upstream GIT http://github.com/rcairo/ @@ -9,7 +9,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 4%{?dist} +Release: 1%{?dist} Group: Development/Languages License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ @@ -36,6 +36,7 @@ BuildRequires: cairo-devel BuildRequires: ruby-devel # For %%check BuildRequires: rubygem(test-unit) +BuildRequires: rubygem(test-unit-notify) BuildRequires: rubygem(pkg-config) # Make sure at least one font is available for test/test_context.rb:57 # `initialize': out of memory (NoMemoryError) @@ -194,6 +195,9 @@ popd %{header_dir}/rb_cairo.h %changelog +* Tue Nov 25 2014 Mamoru TASAKA - 1.14.0-1 +- 1.14.0 + * Mon Aug 18 2014 Fedora Release Engineering - 1.12.9-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index df777b6..b6b2abc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -77641cdb2ae505fde9c254d5e5e1b36c cairo-1.12.9.gem +76e3603c4ee6faf7d00122dc55fbec44 cairo-1.14.0.gem From d1d1a1934a8b0cd100d1a538b20c2d31a9bffc14 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 26 Dec 2014 14:39:06 +0900 Subject: [PATCH 040/127] 1.14.1 --- .gitignore | 1 + rubygem-cairo.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1e9da4e..15f9f26 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /cairo-1.12.8.gem /cairo-1.12.9.gem /cairo-1.14.0.gem +/cairo-1.14.1.gem diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index de2c63c..506ed69 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -1,7 +1,7 @@ %global header_dir %{ruby_vendorarchdir} %global gem_name cairo -%global gemver 1.14.0 +%global gemver 1.14.1 #%%global gem_githash af3e3fc059 # Upstream GIT http://github.com/rcairo/ @@ -195,6 +195,9 @@ popd %{header_dir}/rb_cairo.h %changelog +* Fri Dec 26 2014 Mamoru TASAKA - 1.14.1-1 +- 1.14.1 + * Tue Nov 25 2014 Mamoru TASAKA - 1.14.0-1 - 1.14.0 diff --git a/sources b/sources index b6b2abc..8628e70 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -76e3603c4ee6faf7d00122dc55fbec44 cairo-1.14.0.gem +3ac58dbe91e48a105f4f5979ab147e9f cairo-1.14.1.gem From 9d26a4a34ea888536f73986b07f28a738c116b9e Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 15 Jan 2015 22:31:32 +0900 Subject: [PATCH 041/127] F-22: Rebuild for ruby 2.2 --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 506ed69..48b2673 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -9,7 +9,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/ @@ -195,6 +195,9 @@ popd %{header_dir}/rb_cairo.h %changelog +* Thu Jan 15 2015 Mamoru TASAKA - 1.14.1-2 +- F-22: Rebuild for ruby 2.2 + * Fri Dec 26 2014 Mamoru TASAKA - 1.14.1-1 - 1.14.1 From 5edbcfdc9698ebe0d4ce3b642c76b2ad10eded17 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 18 Jun 2015 22:49:50 +0000 Subject: [PATCH 042/127] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 48b2673..7f11897 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -9,7 +9,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/ @@ -195,6 +195,9 @@ popd %{header_dir}/rb_cairo.h %changelog +* Thu Jun 18 2015 Fedora Release Engineering - 1.14.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Thu Jan 15 2015 Mamoru TASAKA - 1.14.1-2 - F-22: Rebuild for ruby 2.2 From d2fab896d069eb1903d15ac318973adae993ac1f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 9 Sep 2015 14:48:51 +0900 Subject: [PATCH 043/127] Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- .gitignore | 1 + rubygem-cairo.spec | 5 ++--- sources | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 15f9f26..0339011 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /cairo-1.12.9.gem /cairo-1.14.0.gem /cairo-1.14.1.gem +/cairo-1.14.3.gem diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 7f11897..8a9bd55 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -1,7 +1,7 @@ %global header_dir %{ruby_vendorarchdir} %global gem_name cairo -%global gemver 1.14.1 +%global gemver 1.14.3 #%%global gem_githash af3e3fc059 # Upstream GIT http://github.com/rcairo/ @@ -9,7 +9,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 3%{?dist} +Release: 1%{?dist} Group: Development/Languages License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ @@ -158,7 +158,6 @@ 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 diff --git a/sources b/sources index 8628e70..11a5e33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3ac58dbe91e48a105f4f5979ab147e9f cairo-1.14.1.gem +b28fcddc3e4483b078e012fca5fb9723 cairo-1.14.3.gem From f051016d2d9eb744f8617f783ffe70150b097ff3 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 9 Sep 2015 14:51:23 +0900 Subject: [PATCH 044/127] add changelog --- rubygem-cairo.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 8a9bd55..c4952d1 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -194,6 +194,9 @@ popd %{header_dir}/rb_cairo.h %changelog +* Wed Sep 9 2015 amoru TASAKA - 1.14.3-1 +- 1.14.3 + * Thu Jun 18 2015 Fedora Release Engineering - 1.14.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 03f8289774afc3f360da52eecdb5448b691e8de7 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 11 Jan 2016 15:58:56 +0900 Subject: [PATCH 045/127] F-24: rebuild against ruby23 --- rubygem-cairo.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index c4952d1..462df0d 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -1,3 +1,4 @@ + %global header_dir %{ruby_vendorarchdir} %global gem_name cairo @@ -9,7 +10,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/ @@ -194,6 +195,9 @@ popd %{header_dir}/rb_cairo.h %changelog +* Mon Jan 11 2016 Mamoru TASAKA - 1.14.3-2 +- F-24: rebuild against ruby23 + * Wed Sep 9 2015 amoru TASAKA - 1.14.3-1 - 1.14.3 From 2a1269cda872eb800b0650c2f877786d191bfebc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 22:31:26 +0000 Subject: [PATCH 046/127] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 462df0d..b79d432 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -10,7 +10,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/ @@ -195,6 +195,9 @@ popd %{header_dir}/rb_cairo.h %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 1.14.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Mon Jan 11 2016 Mamoru TASAKA - 1.14.3-2 - F-24: rebuild against ruby23 From d19f18cf4ad9579e82bab9a37fbe10cb4a830489 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 19 Apr 2016 17:14:09 +0900 Subject: [PATCH 047/127] 1.15.2 --- .gitignore | 1 + rubygem-cairo.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0339011..70ab590 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /cairo-1.14.0.gem /cairo-1.14.1.gem /cairo-1.14.3.gem +/cairo-1.15.2.gem diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index b79d432..9471b2e 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -2,7 +2,7 @@ %global header_dir %{ruby_vendorarchdir} %global gem_name cairo -%global gemver 1.14.3 +%global gemver 1.15.2 #%%global gem_githash af3e3fc059 # Upstream GIT http://github.com/rcairo/ @@ -10,7 +10,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 3%{?dist} +Release: 1%{?dist} Group: Development/Languages License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ @@ -195,6 +195,9 @@ popd %{header_dir}/rb_cairo.h %changelog +* Tue Apr 19 2016 TASAKA - 1.15.2-1 +- 1.15.2 + * Thu Feb 04 2016 Fedora Release Engineering - 1.14.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 11a5e33..727d84e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b28fcddc3e4483b078e012fca5fb9723 cairo-1.14.3.gem +605f4c9df092de9492055b04c11a4a01 cairo-1.15.2.gem From d026ee2765637db051469c06c1502329bc1bc765 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 30 Nov 2016 15:08:08 +0900 Subject: [PATCH 048/127] 1.15.3 --- .gitignore | 1 + rubygem-cairo.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 70ab590..a194107 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /cairo-1.14.1.gem /cairo-1.14.3.gem /cairo-1.15.2.gem +/cairo-1.15.3.gem diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 9471b2e..83a7116 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -2,7 +2,7 @@ %global header_dir %{ruby_vendorarchdir} %global gem_name cairo -%global gemver 1.15.2 +%global gemver 1.15.3 #%%global gem_githash af3e3fc059 # Upstream GIT http://github.com/rcairo/ @@ -195,7 +195,10 @@ popd %{header_dir}/rb_cairo.h %changelog -* Tue Apr 19 2016 TASAKA - 1.15.2-1 +* Tue Nov 29 2016 Mamoru TASAKA - 1.15.3-1 +- 1.15.3 + +* Tue Apr 19 2016 Mamoru TASAKA - 1.15.2-1 - 1.15.2 * Thu Feb 04 2016 Fedora Release Engineering - 1.14.3-3 diff --git a/sources b/sources index 727d84e..4b25b92 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -605f4c9df092de9492055b04c11a4a01 cairo-1.15.2.gem +7b5d5b724ec9c11467668d60dcc6fff4 cairo-1.15.3.gem From c52930b26d009f24cc2bd1f766236bd1f405fa63 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 11 Jan 2017 08:02:39 +0900 Subject: [PATCH 049/127] 1.15.4 --- .gitignore | 1 + rubygem-cairo.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a194107..474dda1 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /cairo-1.14.3.gem /cairo-1.15.2.gem /cairo-1.15.3.gem +/cairo-1.15.4.gem diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 83a7116..d6ab494 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -2,7 +2,7 @@ %global header_dir %{ruby_vendorarchdir} %global gem_name cairo -%global gemver 1.15.3 +%global gemver 1.15.4 #%%global gem_githash af3e3fc059 # Upstream GIT http://github.com/rcairo/ @@ -195,6 +195,9 @@ popd %{header_dir}/rb_cairo.h %changelog +* Wed Jan 11 2017 Mamoru TASAKA - 1.15.4-1 +- 1.15.4 + * Tue Nov 29 2016 Mamoru TASAKA - 1.15.3-1 - 1.15.3 diff --git a/sources b/sources index 4b25b92..03828c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7b5d5b724ec9c11467668d60dcc6fff4 cairo-1.15.3.gem +SHA512 (cairo-1.15.4.gem) = c8e09f35dc3eddb3106a11230c38b58b03a98f0465d7d721b2ad6ccd90149ce010b7d5d873329c6704bde60ca943dbe6d325d662b6fefcac090ec1252f0b374e From f7447e0655e4adabb8da9af7de82833322ad3dfc Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 15 Jan 2017 19:17:30 +0900 Subject: [PATCH 050/127] 1.15.5 --- .gitignore | 1 + rubygem-cairo.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 474dda1..cfa61ac 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /cairo-1.15.2.gem /cairo-1.15.3.gem /cairo-1.15.4.gem +/cairo-1.15.5.gem diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index d6ab494..f97a708 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -2,7 +2,7 @@ %global header_dir %{ruby_vendorarchdir} %global gem_name cairo -%global gemver 1.15.4 +%global gemver 1.15.5 #%%global gem_githash af3e3fc059 # Upstream GIT http://github.com/rcairo/ @@ -195,6 +195,9 @@ popd %{header_dir}/rb_cairo.h %changelog +* Sun Jan 15 2017 Mamoru TASAKA - 1.15.5-1 +- 1.15.5 + * Wed Jan 11 2017 Mamoru TASAKA - 1.15.4-1 - 1.15.4 diff --git a/sources b/sources index 03828c8..bfc9c2f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-1.15.4.gem) = c8e09f35dc3eddb3106a11230c38b58b03a98f0465d7d721b2ad6ccd90149ce010b7d5d873329c6704bde60ca943dbe6d325d662b6fefcac090ec1252f0b374e +SHA512 (cairo-1.15.5.gem) = 5634334173fb99e2617056694fa5b4af8dfda8010a607329848b6e0e6de5c0f299a433b55525062af82ee228878098db0289b9d3e89aaa725a129e96cfa38660 From 3a5053741a2a117918c2d8403850bac0adea9557 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 12:03:03 +0000 Subject: [PATCH 051/127] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index f97a708..97ab9f2 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -10,7 +10,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/ @@ -195,6 +195,9 @@ popd %{header_dir}/rb_cairo.h %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 1.15.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Sun Jan 15 2017 Mamoru TASAKA - 1.15.5-1 - 1.15.5 From 36d931b2acddc5a65e5191d76bd9ed53b138b259 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 4 May 2017 17:37:48 +0900 Subject: [PATCH 052/127] 1.15.7 --- .gitignore | 1 + rubygem-cairo.spec | 13 ++++++++++--- sources | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index cfa61ac..8a8d13b 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /cairo-1.15.3.gem /cairo-1.15.4.gem /cairo-1.15.5.gem +/cairo-1.15.7.gem diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 97ab9f2..5cff211 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -2,7 +2,7 @@ %global header_dir %{ruby_vendorarchdir} %global gem_name cairo -%global gemver 1.15.5 +%global gemver 1.15.7 #%%global gem_githash af3e3fc059 # Upstream GIT http://github.com/rcairo/ @@ -10,7 +10,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 2%{?dist} +Release: 0.100%{?dist} Group: Development/Languages License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ @@ -39,6 +39,7 @@ BuildRequires: ruby-devel BuildRequires: rubygem(test-unit) BuildRequires: rubygem(test-unit-notify) BuildRequires: rubygem(pkg-config) +BuildRequires: rubygem(native-package-installer) # Make sure at least one font is available for test/test_context.rb:57 # `initialize': out of memory (NoMemoryError) BuildRequires: dejavu-serif-fonts @@ -91,7 +92,10 @@ find . -name \*.gem | xargs chmod 0644 %build # pkg-config dependency should be for development find . -name \*.gemspec | \ - xargs sed -i -e '\@pkg-config@s|runtime_dependency|development_dependency|' + xargs sed -i \ + -e '\@pkg-config@s|runtime_dependency|development_dependency|' \ + -e '\@native-package-installer@s|runtime_dependency|development_dependency|' \ + %{nil} # Once install to TMPINSTDIR for %%check rm -rf ./TMPINSTDIR @@ -195,6 +199,9 @@ popd %{header_dir}/rb_cairo.h %changelog +* Thu May 4 2017 Mamoru TASAKA - 1.15.7-1 +- 1.15.7 + * Sat Feb 11 2017 Fedora Release Engineering - 1.15.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index bfc9c2f..3e842d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-1.15.5.gem) = 5634334173fb99e2617056694fa5b4af8dfda8010a607329848b6e0e6de5c0f299a433b55525062af82ee228878098db0289b9d3e89aaa725a129e96cfa38660 +SHA512 (cairo-1.15.7.gem) = 38173a63b7adab3cf70fc479812c6d1be71cf732062dd5271e6285b27dc71e255bb8536bb8047c18d7f3e219bcadd9ad05e65d592c6679e896140af5cda478a0 From 1bc384e5f8338f0fe9875f6eba9efa62618aafab Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 4 May 2017 17:58:03 +0900 Subject: [PATCH 053/127] fix release number --- rubygem-cairo.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 5cff211..3de7162 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -10,7 +10,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 0.100%{?dist} +Release: 1%{?dist} Group: Development/Languages License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ From 21e4ecd2a487888590a0ef4be73b9e09d76e696a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 5 Jun 2017 14:30:47 +0900 Subject: [PATCH 054/127] 1.15.9 --- .gitignore | 2 ++ rcairo-create-missing-test-files.sh | 32 +++++++++++++++++++++++++++++ rubygem-cairo.spec | 13 +++++++++++- sources | 3 ++- 4 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 rcairo-create-missing-test-files.sh diff --git a/.gitignore b/.gitignore index 8a8d13b..04479dd 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ /cairo-1.15.4.gem /cairo-1.15.5.gem /cairo-1.15.7.gem +/cairo-1.15.9.gem +/rcairo-1.15.9-test-missing-files.tar.gz diff --git a/rcairo-create-missing-test-files.sh b/rcairo-create-missing-test-files.sh new file mode 100644 index 0000000..8d106da --- /dev/null +++ b/rcairo-create-missing-test-files.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +usage() { + echo "$0 " +} + +set -e +set -x + +if [ $# -lt 1 ] ; then + usage + exit 1 +fi + +VERSION=$1 + +TMPDIR=$(mktemp -d /tmp/rcairo-XXXXXX) +CURDIR=$(pwd) + +pushd $TMPDIR + +git clone https://github.com/rcairo/rcairo.git +cd rcairo/ + +git reset --hard v$VERSION +cd .. + +tar czf $CURDIR/rcairo-${VERSION}-test-missing-files.tar.gz rcairo/test/fixture/ + +popd +rm -rf $TMPDIR + diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 3de7162..434641b 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -2,7 +2,7 @@ %global header_dir %{ruby_vendorarchdir} %global gem_name cairo -%global gemver 1.15.7 +%global gemver 1.15.9 #%%global gem_githash af3e3fc059 # Upstream GIT http://github.com/rcairo/ @@ -21,6 +21,10 @@ Source0: %{gem_name}-%{gemver}-%{gem_githash}.gem %endif # Git based gem is created by below Source1: create-cairo-gem.sh +# FIXME +Source11: rcairo-%{version}-test-missing-files.tar.gz +# Source11 is generated by the below +Source12: rcairo-create-missing-test-files.sh %if 0%{?fedora} >= 19 Requires: ruby(release) @@ -160,6 +164,10 @@ ln -sf /bin/true make export PATH=$(pwd):$PATH popd +# Install missing files +tar xf %{SOURCE11} +cp -a rcairo/test/* test + # 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 @@ -199,6 +207,9 @@ popd %{header_dir}/rb_cairo.h %changelog +* Mon Jun 5 2017 Mamoru TASAKA - 1.15.9-1 +- 1.15.9 + * Thu May 4 2017 Mamoru TASAKA - 1.15.7-1 - 1.15.7 diff --git a/sources b/sources index 3e842d3..8b3c0fd 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (cairo-1.15.7.gem) = 38173a63b7adab3cf70fc479812c6d1be71cf732062dd5271e6285b27dc71e255bb8536bb8047c18d7f3e219bcadd9ad05e65d592c6679e896140af5cda478a0 +SHA512 (cairo-1.15.9.gem) = f934a0ad283145bb4710374ccb1b149c6f6bcdc69978cbcd45de8a9da319a4611249262b6ca4f8bd5ef3955739c54b24bb278e36c421cd0af91ed14a43eb7e98 +SHA512 (rcairo-1.15.9-test-missing-files.tar.gz) = 78e40e12ef982dc3358496f236e09209de7ed7ace8360c04c4d75500de72d6cca376d8d36d41b558b3228fa8b9ffdca594b98022e867b1f2b5dcb96dcd4a0156 From 06a15ebcdf5dc32b6f2868ceeb43c76b7e9b611b Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Fri, 14 Jul 2017 10:44:56 -0400 Subject: [PATCH 055/127] Rebuild to disable cairo-gl in F27 --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 434641b..fd1f1eb 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -10,7 +10,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/ @@ -207,6 +207,9 @@ popd %{header_dir}/rb_cairo.h %changelog +* Fri Jul 14 2017 Adam Jackson - 1.15.9-2 +- Rebuild to disable cairo-gl in F27 + * Mon Jun 5 2017 Mamoru TASAKA - 1.15.9-1 - 1.15.9 From f59388afc276e95ddd4b9848d1117e46e98325d3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 13:29:31 +0000 Subject: [PATCH 056/127] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index fd1f1eb..d72ea03 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -10,7 +10,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/ @@ -207,6 +207,9 @@ popd %{header_dir}/rb_cairo.h %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1.15.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Jul 14 2017 Adam Jackson - 1.15.9-2 - Rebuild to disable cairo-gl in F27 From 0e427b69c94f7946b9bc9855e55bc59ada223928 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 07:52:47 +0000 Subject: [PATCH 057/127] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index d72ea03..84da863 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -10,7 +10,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 3%{?dist} +Release: 4%{?dist} Group: Development/Languages License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ @@ -207,6 +207,9 @@ popd %{header_dir}/rb_cairo.h %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1.15.9-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 1.15.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 545e547817ea5d7c5fa459d72881f01652658aeb Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 21 Oct 2017 15:35:08 +0900 Subject: [PATCH 058/127] 1.15.10 --- .gitignore | 2 ++ rubygem-cairo.spec | 15 ++++++++++++--- sources | 4 ++-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 04479dd..2c761f4 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,5 @@ /cairo-1.15.7.gem /cairo-1.15.9.gem /rcairo-1.15.9-test-missing-files.tar.gz +/cairo-1.15.10.gem +/rcairo-1.15.10-test-missing-files.tar.gz diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 84da863..201890b 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -2,7 +2,7 @@ %global header_dir %{ruby_vendorarchdir} %global gem_name cairo -%global gemver 1.15.9 +%global gemver 1.15.10 #%%global gem_githash af3e3fc059 # Upstream GIT http://github.com/rcairo/ @@ -10,7 +10,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 4%{?dist} +Release: 1%{?dist} Group: Development/Languages License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ @@ -172,7 +172,13 @@ cp -a rcairo/test/* test 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 +# Tracking: https://github.com/rcairo/rcairo/issues/50 +ruby ./test/run-test.rb || \ +%if 0%{?fedora} >= 27 + true +%else + false +%endif popd %files @@ -207,6 +213,9 @@ popd %{header_dir}/rb_cairo.h %changelog +* Sat Oct 21 2017 Mamoru TASAKA - 1.15.10-1 +- 1.15.10 + * Thu Aug 03 2017 Fedora Release Engineering - 1.15.9-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 8b3c0fd..b4a801e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (cairo-1.15.9.gem) = f934a0ad283145bb4710374ccb1b149c6f6bcdc69978cbcd45de8a9da319a4611249262b6ca4f8bd5ef3955739c54b24bb278e36c421cd0af91ed14a43eb7e98 -SHA512 (rcairo-1.15.9-test-missing-files.tar.gz) = 78e40e12ef982dc3358496f236e09209de7ed7ace8360c04c4d75500de72d6cca376d8d36d41b558b3228fa8b9ffdca594b98022e867b1f2b5dcb96dcd4a0156 +SHA512 (cairo-1.15.10.gem) = af3cec5bf03022a5049922aaa0366b7330ec0e2003734ee855d1d9632d2027be6e08efd8b67c02bf3d006d11d8a7e28ac3d23ce9591940dc92442c7552858907 +SHA512 (rcairo-1.15.10-test-missing-files.tar.gz) = bae8b81843ff0a0e740f0522c1f88494637ea94298c36eb48e0b9345f46d58f0f4fbf232c7c133b4c0cdc32ffdf5f8a4a25c7c1f6157dab3be2e9a14908dbcb7 From 8b0265e8aaa13b69930588324d0a3d03874a2979 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 27 Dec 2017 16:09:12 +0900 Subject: [PATCH 059/127] 1.15.11 --- .gitignore | 2 ++ rubygem-cairo.spec | 39 ++++++++++++++++++++++++--------------- sources | 4 ++-- 3 files changed, 28 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 2c761f4..f18726d 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,5 @@ /rcairo-1.15.9-test-missing-files.tar.gz /cairo-1.15.10.gem /rcairo-1.15.10-test-missing-files.tar.gz +/cairo-1.15.11.gem +/rcairo-1.15.11-test-missing-files.tar.gz diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 201890b..1fe2f99 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -2,7 +2,7 @@ %global header_dir %{ruby_vendorarchdir} %global gem_name cairo -%global gemver 1.15.10 +%global gemver 1.15.11 #%%global gem_githash af3e3fc059 # Upstream GIT http://github.com/rcairo/ @@ -85,15 +85,19 @@ Header files and libraries for building a extension library for the ruby-cairo %prep -%setup -q -T -c +%setup -q -c -T -mkdir -p ./%{gem_dir} -export CONFIGURE_ARGS="--with-cflags='%{optflags}'" -%gem_install -n %{SOURCE0} +TOPDIR=$(pwd) +mkdir tmpunpackdir +pushd tmpunpackdir -find . -name \*.gem | xargs chmod 0644 +gem unpack %{SOURCE0} +cd %{gem_name}-%{version} + +#Patches, etc + +gem specification -l --ruby %{SOURCE0} > %{gem_name}.gemspec -%build # pkg-config dependency should be for development find . -name \*.gemspec | \ xargs sed -i \ @@ -101,6 +105,15 @@ find . -name \*.gemspec | \ -e '\@native-package-installer@s|runtime_dependency|development_dependency|' \ %{nil} +gem build %{gem_name}.gemspec +mv %{gem_name}-%{version}.gem $TOPDIR + +popd +rm -rf tmpunpackdir + +%build +%gem_install + # Once install to TMPINSTDIR for %%check rm -rf ./TMPINSTDIR mkdir -p ./TMPINSTDIR/%{gem_dir} @@ -172,14 +185,7 @@ cp -a rcairo/test/* test 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 -# Tracking: https://github.com/rcairo/rcairo/issues/50 -ruby ./test/run-test.rb || \ -%if 0%{?fedora} >= 27 - true -%else - false -%endif -popd +ruby ./test/run-test.rb %files %if 0%{?fedora} >= 21 @@ -213,6 +219,9 @@ popd %{header_dir}/rb_cairo.h %changelog +* Wed Dec 27 2017 Mamoru TASAKA - 1.15.11-1 +- 1.15.11 + * Sat Oct 21 2017 Mamoru TASAKA - 1.15.10-1 - 1.15.10 diff --git a/sources b/sources index b4a801e..fb9b856 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (cairo-1.15.10.gem) = af3cec5bf03022a5049922aaa0366b7330ec0e2003734ee855d1d9632d2027be6e08efd8b67c02bf3d006d11d8a7e28ac3d23ce9591940dc92442c7552858907 -SHA512 (rcairo-1.15.10-test-missing-files.tar.gz) = bae8b81843ff0a0e740f0522c1f88494637ea94298c36eb48e0b9345f46d58f0f4fbf232c7c133b4c0cdc32ffdf5f8a4a25c7c1f6157dab3be2e9a14908dbcb7 +SHA512 (cairo-1.15.11.gem) = 3c21468511eac323b27a86e1c5188b5444d3bf2de244f4dc35d0ae297cb3f1756ec8333555bb7c4178e9f4ebcfd1600e6fd77fa7fe76055bf633bb2f8c69271c +SHA512 (rcairo-1.15.11-test-missing-files.tar.gz) = 4a899926d84e4392c889647804ea9e79511544c29fa34137020fac97bd424b5346fbc280142b226f82f9421865b382a881da38ecf0acb45905dc9e230014fbb2 From 7b5a5b20ac8ee3438f5e8ad9929bfb77b444b02c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 4 Jan 2018 00:54:09 +0900 Subject: [PATCH 060/127] F-28: rebuild for ruby25 --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 1fe2f99..af45e55 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -10,7 +10,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/ @@ -219,6 +219,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Wed Jan 03 2018 Mamoru TASAKA - 1.15.11-2 +- F-28: rebuild for ruby25 + * Wed Dec 27 2017 Mamoru TASAKA - 1.15.11-1 - 1.15.11 From 9e948d736ad96b9f103fb04a559544e46cab53ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 20 Jan 2018 23:07:53 +0100 Subject: [PATCH 061/127] Rebuilt for switch to libxcrypt --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index af45e55..88dfa91 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -10,7 +10,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/ @@ -219,6 +219,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Sat Jan 20 2018 Björn Esser - 1.15.11-3 +- Rebuilt for switch to libxcrypt + * Wed Jan 03 2018 Mamoru TASAKA - 1.15.11-2 - F-28: rebuild for ruby25 From a30787b0f5e70f5c21f89a0698423fb715501e47 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 13:38:36 +0000 Subject: [PATCH 062/127] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 88dfa91..1b242f0 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -10,7 +10,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 3%{?dist} +Release: 4%{?dist} Group: Development/Languages License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ @@ -219,6 +219,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1.15.11-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sat Jan 20 2018 Björn Esser - 1.15.11-3 - Rebuilt for switch to libxcrypt From e572f5adeed22d82496631fba9c61dca106d241b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 16 Mar 2018 13:48:31 +0900 Subject: [PATCH 063/127] 1.15.12 --- .gitignore | 2 ++ rubygem-cairo.spec | 10 ++++++++-- sources | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f18726d..5044bfa 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,5 @@ /rcairo-1.15.10-test-missing-files.tar.gz /cairo-1.15.11.gem /rcairo-1.15.11-test-missing-files.tar.gz +/cairo-1.15.12.gem +/rcairo-1.15.12-test-missing-files.tar.gz diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 1b242f0..00f7ca6 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -2,7 +2,7 @@ %global header_dir %{ruby_vendorarchdir} %global gem_name cairo -%global gemver 1.15.11 +%global gemver 1.15.12 #%%global gem_githash af3e3fc059 # Upstream GIT http://github.com/rcairo/ @@ -10,7 +10,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 4%{?dist} +Release: 1%{?dist} Group: Development/Languages License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ @@ -36,6 +36,8 @@ BuildRequires: ruby(abi) = %{rubyabi} BuildRequires: ruby %endif +BuildRequires: gcc + BuildRequires: rubygems-devel BuildRequires: cairo-devel BuildRequires: ruby-devel @@ -43,6 +45,7 @@ BuildRequires: ruby-devel BuildRequires: rubygem(test-unit) BuildRequires: rubygem(test-unit-notify) BuildRequires: rubygem(pkg-config) +BuildRequires: rubygem(poppler) BuildRequires: rubygem(native-package-installer) # Make sure at least one font is available for test/test_context.rb:57 # `initialize': out of memory (NoMemoryError) @@ -219,6 +222,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Fri Mar 16 2018 Mamoru TASAKA - 1.15.12-1 +- 1.15.12 + * Fri Feb 09 2018 Fedora Release Engineering - 1.15.11-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index fb9b856..f4f3c7b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (cairo-1.15.11.gem) = 3c21468511eac323b27a86e1c5188b5444d3bf2de244f4dc35d0ae297cb3f1756ec8333555bb7c4178e9f4ebcfd1600e6fd77fa7fe76055bf633bb2f8c69271c -SHA512 (rcairo-1.15.11-test-missing-files.tar.gz) = 4a899926d84e4392c889647804ea9e79511544c29fa34137020fac97bd424b5346fbc280142b226f82f9421865b382a881da38ecf0acb45905dc9e230014fbb2 +SHA512 (cairo-1.15.12.gem) = e4b3f7851aa5658fec56090a7c0a54748b04bfa2b6ecab555c5c1228b1ec337401b29bf32d7201efc260adbb56af47a4c400a91034c5562f002b4475b3413745 +SHA512 (rcairo-1.15.12-test-missing-files.tar.gz) = aadde826759dec642835080e8fb094d33127f2675f15aa51f7c2b7f6d32512c72db77c7f8e1549b1209a69eceeafb12d248e230c346b649f65e50b18caaca664 From dbd2ee56523d510e9ed307c9bfb45d7e26611b91 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 2 May 2018 16:11:42 +0900 Subject: [PATCH 064/127] 1.15.13 --- .gitignore | 2 ++ rubygem-cairo.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5044bfa..2e3684d 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,5 @@ /rcairo-1.15.11-test-missing-files.tar.gz /cairo-1.15.12.gem /rcairo-1.15.12-test-missing-files.tar.gz +/cairo-1.15.13.gem +/rcairo-1.15.13-test-missing-files.tar.gz diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 00f7ca6..caf37bf 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -2,7 +2,7 @@ %global header_dir %{ruby_vendorarchdir} %global gem_name cairo -%global gemver 1.15.12 +%global gemver 1.15.13 #%%global gem_githash af3e3fc059 # Upstream GIT http://github.com/rcairo/ @@ -222,6 +222,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Wed May 2 2018 Mamoru TASAKA - 1.15.13-1 +- 1.15.13 + * Fri Mar 16 2018 Mamoru TASAKA - 1.15.12-1 - 1.15.12 diff --git a/sources b/sources index f4f3c7b..026bdc3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (cairo-1.15.12.gem) = e4b3f7851aa5658fec56090a7c0a54748b04bfa2b6ecab555c5c1228b1ec337401b29bf32d7201efc260adbb56af47a4c400a91034c5562f002b4475b3413745 -SHA512 (rcairo-1.15.12-test-missing-files.tar.gz) = aadde826759dec642835080e8fb094d33127f2675f15aa51f7c2b7f6d32512c72db77c7f8e1549b1209a69eceeafb12d248e230c346b649f65e50b18caaca664 +SHA512 (cairo-1.15.13.gem) = accab295acbb5b82e456c96b29681c37befdb6d1d4c93f8dd3d6cdd772374a3c6fad914f1ed097ee0575dd1e184eb22794f315bc8d02d0558f89f88b63870b86 +SHA512 (rcairo-1.15.13-test-missing-files.tar.gz) = c9b92c5c5757d7eaebad6829b657b268173ede64b53c3a872a9f26df46fcfcab4f0b83e6dcae6621c143d50d42a38ff0dad5894429ea9143c2f6e5368c6efa92 From 85d2afa174c437c93f23e953e63fe3b17ed58b76 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 2 May 2018 16:26:17 +0900 Subject: [PATCH 065/127] for now ignore test failure, will try with ruby-gnome2 3.2.5 later --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index caf37bf..d45c18d 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -188,7 +188,10 @@ cp -a rcairo/test/* test 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 +ruby ./test/run-test.rb \ +%if 0%{?fedora} >= 29 + || true +%endif %files %if 0%{?fedora} >= 21 From 0889a9c508318359697b348ea3a2ef2eed8a0e9d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 03:57:14 +0000 Subject: [PATCH 066/127] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index d45c18d..2d319b5 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -10,7 +10,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/ @@ -225,6 +225,9 @@ ruby ./test/run-test.rb \ %{header_dir}/rb_cairo.h %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 1.15.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed May 2 2018 Mamoru TASAKA - 1.15.13-1 - 1.15.13 From 8cce35923367a1f16abcc8c489c56d61815cd055 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 24 Aug 2018 16:35:31 +0900 Subject: [PATCH 067/127] 1.15.14 --- .gitignore | 2 ++ rubygem-cairo.spec | 7 +++++-- sources | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2e3684d..5d70266 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,5 @@ /rcairo-1.15.12-test-missing-files.tar.gz /cairo-1.15.13.gem /rcairo-1.15.13-test-missing-files.tar.gz +/cairo-1.15.14.gem +/rcairo-1.15.14-test-missing-files.tar.gz diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 2d319b5..56e0bef 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -2,7 +2,7 @@ %global header_dir %{ruby_vendorarchdir} %global gem_name cairo -%global gemver 1.15.13 +%global gemver 1.15.14 #%%global gem_githash af3e3fc059 # Upstream GIT http://github.com/rcairo/ @@ -10,7 +10,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 2%{?dist} +Release: 1%{?dist} Group: Development/Languages License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ @@ -225,6 +225,9 @@ ruby ./test/run-test.rb \ %{header_dir}/rb_cairo.h %changelog +* Fri Aug 24 2018 Mamoru TASAKA - 1.15.14-1 +- 1.15.14 + * Sat Jul 14 2018 Fedora Release Engineering - 1.15.13-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 026bdc3..7ae146c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (cairo-1.15.13.gem) = accab295acbb5b82e456c96b29681c37befdb6d1d4c93f8dd3d6cdd772374a3c6fad914f1ed097ee0575dd1e184eb22794f315bc8d02d0558f89f88b63870b86 -SHA512 (rcairo-1.15.13-test-missing-files.tar.gz) = c9b92c5c5757d7eaebad6829b657b268173ede64b53c3a872a9f26df46fcfcab4f0b83e6dcae6621c143d50d42a38ff0dad5894429ea9143c2f6e5368c6efa92 +SHA512 (cairo-1.15.14.gem) = ca05638e93f426a32d8483acf47ee839a0137ca1305cb0dc1c71131237e49e6c395f6a51c7ebc9957a3553c8fd59737652c57d96beb8c24bffa16d40c14a51f9 +SHA512 (rcairo-1.15.14-test-missing-files.tar.gz) = e5c7ec979d8b3eb20a6b7fa76dedcdfb3e3c570ffcb1b510a8ce46a946917c0eb11a0087c57d9f66c9dfc6c6f47035369d62012ab559935a2c39832eec7fa5d1 From 5ec59b557c960115453c44c9c0fba5d919a217ca Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 14 Nov 2018 15:08:35 +0900 Subject: [PATCH 068/127] 1.16.2 --- .gitignore | 2 ++ rubygem-cairo.spec | 7 ++++++- sources | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5d70266..aa7d104 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,5 @@ /rcairo-1.15.13-test-missing-files.tar.gz /cairo-1.15.14.gem /rcairo-1.15.14-test-missing-files.tar.gz +/cairo-1.16.2.gem +/rcairo-1.16.2-test-missing-files.tar.gz diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 56e0bef..3b9a202 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -2,11 +2,13 @@ %global header_dir %{ruby_vendorarchdir} %global gem_name cairo -%global gemver 1.15.14 +%global gemver 1.16.2 #%%global gem_githash af3e3fc059 # Upstream GIT http://github.com/rcairo/ +%undefine _changelog_trimtime + Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} @@ -225,6 +227,9 @@ ruby ./test/run-test.rb \ %{header_dir}/rb_cairo.h %changelog +* Wed Nov 14 2018 Mamoru TASAKA - 1.16.2-1 +- 1.16.2 + * Fri Aug 24 2018 Mamoru TASAKA - 1.15.14-1 - 1.15.14 diff --git a/sources b/sources index 7ae146c..0f3aa89 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (cairo-1.15.14.gem) = ca05638e93f426a32d8483acf47ee839a0137ca1305cb0dc1c71131237e49e6c395f6a51c7ebc9957a3553c8fd59737652c57d96beb8c24bffa16d40c14a51f9 -SHA512 (rcairo-1.15.14-test-missing-files.tar.gz) = e5c7ec979d8b3eb20a6b7fa76dedcdfb3e3c570ffcb1b510a8ce46a946917c0eb11a0087c57d9f66c9dfc6c6f47035369d62012ab559935a2c39832eec7fa5d1 +SHA512 (cairo-1.16.2.gem) = b711399ddd7afa958e3faee87b2a768f55af9ec0cef486d9edcf082a0c7a5ec90610d9a52784d55608a70befe4571e4cb1abc401a8a5b5357fa0bfff9159d239 +SHA512 (rcairo-1.16.2-test-missing-files.tar.gz) = c35b155596e2ed690a8a69735f4522a2840a7fa71b0e664bce7416cdb4bba13343dcfb6a20d39715935f71eb49a78a4fa9796691d0ed835b6502fbf3a1989dca From 81d33472cc78b824123083fa182d6c210fcec784 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 21 Jan 2019 16:19:30 +0900 Subject: [PATCH 069/127] F-30: rebuild against ruby26 Once disable tests for circular dependency --- rubygem-cairo.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 3b9a202..aa987bd 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -12,7 +12,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/ @@ -47,7 +47,8 @@ BuildRequires: ruby-devel BuildRequires: rubygem(test-unit) BuildRequires: rubygem(test-unit-notify) BuildRequires: rubygem(pkg-config) -BuildRequires: rubygem(poppler) +####### FIX THIS LATER +#BuildRequires: rubygem(poppler) BuildRequires: rubygem(native-package-installer) # Make sure at least one font is available for test/test_context.rb:57 # `initialize': out of memory (NoMemoryError) @@ -167,6 +168,9 @@ rm -f ./TMPINSTDIR/%{gem_instdir}/{Makefile*,extconf.rb} cp -a ./TMPINSTDIR/* %{buildroot}/ %check +####### FIX THIS LATER +exit 0 + %if 0%{?fedora} >= 21 export RUBYLIB=$(pwd)/TMPINSTDIR/%{gem_instdir}:$(pwd)/TMPINSTDIR/%{gem_extdir_mri}/ %else @@ -227,6 +231,10 @@ ruby ./test/run-test.rb \ %{header_dir}/rb_cairo.h %changelog +* Mon Jan 21 2019 Mamoru TASAKA - 1.16.2-2 +- F-30: rebuild against ruby26 +- Once disable tests for circular dependency + * Wed Nov 14 2018 Mamoru TASAKA - 1.16.2-1 - 1.16.2 From 066634b78b251aa1a4789a405f8368f86b636aa0 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:22 +0100 Subject: [PATCH 070/127] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- rubygem-cairo.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index aa987bd..01bd073 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -13,7 +13,6 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} Release: 2%{?dist} -Group: Development/Languages License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ %if 1 @@ -66,7 +65,6 @@ X Window System, win32, and image buffers. %package doc Summary: Documentation for %{name} -Group: Documentation Requires: %{name} = %{version}-%{release} %description doc @@ -74,7 +72,6 @@ This package contains documentation for %{name}. %package devel Summary: Ruby-cairo development environment -Group: Development/Languages Requires: %{name} = %{version}-%{release} Requires: cairo-devel Requires: ruby-devel From 5679af3dd631c14df2be2713991d87bce09d2943 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 11:53:26 +0000 Subject: [PATCH 071/127] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 01bd073..68057b0 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -12,7 +12,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ %if 1 @@ -228,6 +228,9 @@ ruby ./test/run-test.rb \ %{header_dir}/rb_cairo.h %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 1.16.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Jan 21 2019 Mamoru TASAKA - 1.16.2-2 - F-30: rebuild against ruby26 - Once disable tests for circular dependency From f69ed12c5ef23f1e7f8d0227f6370e8e9fdc8098 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 18 Mar 2019 13:43:39 +0900 Subject: [PATCH 072/127] Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild --- .gitignore | 2 ++ rubygem-cairo.spec | 15 ++++----------- sources | 4 ++-- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index aa7d104..319c6bf 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,5 @@ /rcairo-1.15.14-test-missing-files.tar.gz /cairo-1.16.2.gem /rcairo-1.16.2-test-missing-files.tar.gz +/cairo-1.16.4.gem +/rcairo-1.16.4-test-missing-files.tar.gz diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 68057b0..ed4ce3e 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -2,7 +2,7 @@ %global header_dir %{ruby_vendorarchdir} %global gem_name cairo -%global gemver 1.16.2 +%global gemver 1.16.4 #%%global gem_githash af3e3fc059 # Upstream GIT http://github.com/rcairo/ @@ -12,7 +12,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 3%{?dist} +Release: 1%{?dist} License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ %if 1 @@ -46,8 +46,7 @@ BuildRequires: ruby-devel BuildRequires: rubygem(test-unit) BuildRequires: rubygem(test-unit-notify) BuildRequires: rubygem(pkg-config) -####### FIX THIS LATER -#BuildRequires: rubygem(poppler) +BuildRequires: rubygem(poppler) BuildRequires: rubygem(native-package-installer) # Make sure at least one font is available for test/test_context.rb:57 # `initialize': out of memory (NoMemoryError) @@ -165,9 +164,6 @@ rm -f ./TMPINSTDIR/%{gem_instdir}/{Makefile*,extconf.rb} cp -a ./TMPINSTDIR/* %{buildroot}/ %check -####### FIX THIS LATER -exit 0 - %if 0%{?fedora} >= 21 export RUBYLIB=$(pwd)/TMPINSTDIR/%{gem_instdir}:$(pwd)/TMPINSTDIR/%{gem_extdir_mri}/ %else @@ -191,10 +187,7 @@ cp -a rcairo/test/* test 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 \ -%if 0%{?fedora} >= 29 - || true -%endif +ruby ./test/run-test.rb %files %if 0%{?fedora} >= 21 diff --git a/sources b/sources index 0f3aa89..8ffb9c7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (cairo-1.16.2.gem) = b711399ddd7afa958e3faee87b2a768f55af9ec0cef486d9edcf082a0c7a5ec90610d9a52784d55608a70befe4571e4cb1abc401a8a5b5357fa0bfff9159d239 -SHA512 (rcairo-1.16.2-test-missing-files.tar.gz) = c35b155596e2ed690a8a69735f4522a2840a7fa71b0e664bce7416cdb4bba13343dcfb6a20d39715935f71eb49a78a4fa9796691d0ed835b6502fbf3a1989dca +SHA512 (cairo-1.16.4.gem) = 5af8536cd374255386fdc84b265deebb7ed21ef270538f0c2d6a5cdf3dcf1c913633f1ca813f197460968b20b6e592f24334b872cf822584d4de28c589160da8 +SHA512 (rcairo-1.16.4-test-missing-files.tar.gz) = df6795262f5bd98c6f9dc6173dfd5e8327e00f0d47951d9572d81476366c23ee2b85b65f0ece13b55d22d9485de23993b392d57cf4f02dfe60ec575878a98ffc From 5f4157363fe59a4eda16df39f9c4a36571d793d0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 19:04:52 +0000 Subject: [PATCH 073/127] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index ed4ce3e..503eb2e 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -12,7 +12,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ %if 1 @@ -221,6 +221,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 1.16.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Feb 02 2019 Fedora Release Engineering - 1.16.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 10a651cd71463396dc7487cea10fe25ab2632e69 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 17 Jan 2020 12:12:29 +0900 Subject: [PATCH 074/127] F-32: rebuild against ruby27 Once disable tests for circular dependency --- rubygem-cairo.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 503eb2e..08e7c02 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -12,7 +12,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ %if 1 @@ -43,6 +43,7 @@ BuildRequires: rubygems-devel BuildRequires: cairo-devel BuildRequires: ruby-devel # For %%check +%if 0 BuildRequires: rubygem(test-unit) BuildRequires: rubygem(test-unit-notify) BuildRequires: rubygem(pkg-config) @@ -51,6 +52,7 @@ BuildRequires: rubygem(native-package-installer) # Make sure at least one font is available for test/test_context.rb:57 # `initialize': out of memory (NoMemoryError) BuildRequires: dejavu-serif-fonts +%endif Requires: rubygems Provides: rubygem(%{gem_name}) = %{version}-%{release} @@ -164,6 +166,7 @@ rm -f ./TMPINSTDIR/%{gem_instdir}/{Makefile*,extconf.rb} cp -a ./TMPINSTDIR/* %{buildroot}/ %check +exit 0 %if 0%{?fedora} >= 21 export RUBYLIB=$(pwd)/TMPINSTDIR/%{gem_instdir}:$(pwd)/TMPINSTDIR/%{gem_extdir_mri}/ %else @@ -221,6 +224,10 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Fri Jan 17 2020 Mamoru TASAKA - 1.16.4-3 +- F-32: rebuild against ruby27 +- Once disable tests for circular dependency + * Fri Jul 26 2019 Fedora Release Engineering - 1.16.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From fe22e4a6dde62f21f3b897e3a940eaa7aa466b10 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 17 Jan 2020 12:16:56 +0900 Subject: [PATCH 075/127] fix BR --- rubygem-cairo.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 08e7c02..abb0d09 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -43,10 +43,10 @@ BuildRequires: rubygems-devel BuildRequires: cairo-devel BuildRequires: ruby-devel # For %%check -%if 0 BuildRequires: rubygem(test-unit) BuildRequires: rubygem(test-unit-notify) BuildRequires: rubygem(pkg-config) +%if 0 BuildRequires: rubygem(poppler) BuildRequires: rubygem(native-package-installer) # Make sure at least one font is available for test/test_context.rb:57 From 679566e7fd691378976f3a8cf3378c596a351d9b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 17 Jan 2020 12:23:22 +0900 Subject: [PATCH 076/127] more BR fix --- rubygem-cairo.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index abb0d09..c41d303 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -46,9 +46,9 @@ BuildRequires: ruby-devel BuildRequires: rubygem(test-unit) BuildRequires: rubygem(test-unit-notify) BuildRequires: rubygem(pkg-config) +BuildRequires: rubygem(native-package-installer) %if 0 BuildRequires: rubygem(poppler) -BuildRequires: rubygem(native-package-installer) # Make sure at least one font is available for test/test_context.rb:57 # `initialize': out of memory (NoMemoryError) BuildRequires: dejavu-serif-fonts From af8a085d549d0b5aaaa7746bc5e350b5b8fc5df4 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 17 Jan 2020 21:43:20 +0900 Subject: [PATCH 077/127] Enable tests again --- rubygem-cairo.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index c41d303..93bf945 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -12,7 +12,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ %if 1 @@ -47,7 +47,8 @@ BuildRequires: rubygem(test-unit) BuildRequires: rubygem(test-unit-notify) BuildRequires: rubygem(pkg-config) BuildRequires: rubygem(native-package-installer) -%if 0 +# Circular dependency +%if 1 BuildRequires: rubygem(poppler) # Make sure at least one font is available for test/test_context.rb:57 # `initialize': out of memory (NoMemoryError) @@ -166,7 +167,6 @@ rm -f ./TMPINSTDIR/%{gem_instdir}/{Makefile*,extconf.rb} cp -a ./TMPINSTDIR/* %{buildroot}/ %check -exit 0 %if 0%{?fedora} >= 21 export RUBYLIB=$(pwd)/TMPINSTDIR/%{gem_instdir}:$(pwd)/TMPINSTDIR/%{gem_extdir_mri}/ %else @@ -224,6 +224,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Fri Jan 17 2020 Mamoru TASAKA - 1.16.4-4 +- Enable tests again + * Fri Jan 17 2020 Mamoru TASAKA - 1.16.4-3 - F-32: rebuild against ruby27 - Once disable tests for circular dependency From c76b1e2e88f94bf5a04f68b350b120672259ff6f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 18:12:04 +0000 Subject: [PATCH 078/127] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 93bf945..e27c033 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -12,7 +12,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ %if 1 @@ -224,6 +224,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 1.16.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jan 17 2020 Mamoru TASAKA - 1.16.4-4 - Enable tests again From cad25baad3b0a2287c40bfb9dc7d0b2d65043228 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 5 Feb 2020 14:40:29 +0900 Subject: [PATCH 079/127] 1.16.5 --- .gitignore | 2 ++ rubygem-cairo.spec | 7 +++++-- sources | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 319c6bf..8190f7f 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,5 @@ /rcairo-1.16.2-test-missing-files.tar.gz /cairo-1.16.4.gem /rcairo-1.16.4-test-missing-files.tar.gz +/cairo-1.16.5.gem +/rcairo-1.16.5-test-missing-files.tar.gz diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index e27c033..75db6d8 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -2,7 +2,7 @@ %global header_dir %{ruby_vendorarchdir} %global gem_name cairo -%global gemver 1.16.4 +%global gemver 1.16.5 #%%global gem_githash af3e3fc059 # Upstream GIT http://github.com/rcairo/ @@ -12,7 +12,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 5%{?dist} +Release: 1%{?dist} License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ %if 1 @@ -224,6 +224,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Wed Feb 5 2020 Mamoru TASAKA - 1.16.5-1 +- 1.16.5 + * Thu Jan 30 2020 Fedora Release Engineering - 1.16.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 8ffb9c7..994f471 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (cairo-1.16.4.gem) = 5af8536cd374255386fdc84b265deebb7ed21ef270538f0c2d6a5cdf3dcf1c913633f1ca813f197460968b20b6e592f24334b872cf822584d4de28c589160da8 -SHA512 (rcairo-1.16.4-test-missing-files.tar.gz) = df6795262f5bd98c6f9dc6173dfd5e8327e00f0d47951d9572d81476366c23ee2b85b65f0ece13b55d22d9485de23993b392d57cf4f02dfe60ec575878a98ffc +SHA512 (cairo-1.16.5.gem) = 98c10e16a3a2d964dd9b5fd450118068042e721f9655758ca567ed45f418ce1c2b9fe8cfa991a94778eb17d69fef65008d2c21244592f4f1819104bdeb76bdcc +SHA512 (rcairo-1.16.5-test-missing-files.tar.gz) = 7ae3b12aa68b77792db71080f33784cae83aca2a64b5d5c3097bd69f8ade5d55a941d4c8256f1ab693832fdc9462a4450676fb490bc7bb3735f1748e21c3742d From ecd8a377df350ef0778fdaeb9b944bb63060320a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 06:11:02 +0000 Subject: [PATCH 080/127] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 75db6d8..3334713 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -12,7 +12,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ %if 1 @@ -224,6 +224,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.16.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Feb 5 2020 Mamoru TASAKA - 1.16.5-1 - 1.16.5 From 55c4ee6f9711b85f2e224acd611a4bafdd9cec41 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 9 Aug 2020 14:00:33 +0900 Subject: [PATCH 081/127] 1.16.6 --- .gitignore | 2 ++ rubygem-cairo.spec | 7 +++++-- sources | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 8190f7f..2b3550c 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,5 @@ /rcairo-1.16.4-test-missing-files.tar.gz /cairo-1.16.5.gem /rcairo-1.16.5-test-missing-files.tar.gz +/rcairo-1.16.6-test-missing-files.tar.gz +/cairo-1.16.6.gem diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 3334713..36f7f65 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -2,7 +2,7 @@ %global header_dir %{ruby_vendorarchdir} %global gem_name cairo -%global gemver 1.16.5 +%global gemver 1.16.6 #%%global gem_githash af3e3fc059 # Upstream GIT http://github.com/rcairo/ @@ -12,7 +12,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ %if 1 @@ -224,6 +224,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Sun Aug 9 2020 Mamoru TASAKA - 1.16.6-1 +- 1.16.6 + * Wed Jul 29 2020 Fedora Release Engineering - 1.16.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 994f471..93f3325 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (cairo-1.16.5.gem) = 98c10e16a3a2d964dd9b5fd450118068042e721f9655758ca567ed45f418ce1c2b9fe8cfa991a94778eb17d69fef65008d2c21244592f4f1819104bdeb76bdcc -SHA512 (rcairo-1.16.5-test-missing-files.tar.gz) = 7ae3b12aa68b77792db71080f33784cae83aca2a64b5d5c3097bd69f8ade5d55a941d4c8256f1ab693832fdc9462a4450676fb490bc7bb3735f1748e21c3742d +SHA512 (rcairo-1.16.6-test-missing-files.tar.gz) = e42f5a5ca7ce314dd766756a468237d25ba77a233ef62cba429d6a1c3f1dc4e5b9f34cb807b95357449e2ce2d0cebb1b00a0444a6a0ed0d6270e2fcad206b7d3 +SHA512 (cairo-1.16.6.gem) = f499daa83e865d58cc29d158ce649cab9f939464a08e5d7711f6cf255fb8dcfbf52457e3d2b81aef2018ad8d0762117776049b3681c9be6abdf4f0b12e43404c From b1fe63ac9082b827414417603c0bded3805b8827 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 31 Dec 2020 21:46:33 +0900 Subject: [PATCH 082/127] add bootstrap logic (not build for now, pending for ruby 3.0) --- rubygem-cairo.spec | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 36f7f65..f99de42 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -5,6 +5,8 @@ %global gemver 1.16.6 #%%global gem_githash af3e3fc059 +%global need_test_bootstrap 1 + # Upstream GIT http://github.com/rcairo/ %undefine _changelog_trimtime @@ -12,7 +14,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 1%{?dist} +Release: 1.99%{?dist} License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ %if 1 @@ -48,7 +50,7 @@ BuildRequires: rubygem(test-unit-notify) BuildRequires: rubygem(pkg-config) BuildRequires: rubygem(native-package-installer) # Circular dependency -%if 1 +%if 0%{?need_test_bootstrap} < 1 BuildRequires: rubygem(poppler) # Make sure at least one font is available for test/test_context.rb:57 # `initialize': out of memory (NoMemoryError) @@ -167,12 +169,12 @@ rm -f ./TMPINSTDIR/%{gem_instdir}/{Makefile*,extconf.rb} cp -a ./TMPINSTDIR/* %{buildroot}/ %check -%if 0%{?fedora} >= 21 -export RUBYLIB=$(pwd)/TMPINSTDIR/%{gem_instdir}:$(pwd)/TMPINSTDIR/%{gem_extdir_mri}/ -%else -export RUBYLIB=$(pwd)/TMPINSTDIR/%{gem_instdir}:$(pwd)/TMPINSTDIR/%{gem_extdir_mri}/lib +%if 0%{?need_test_bootstrap} >= 1 +exit 0 %endif +export RUBYLIB=$(pwd)/TMPINSTDIR/%{gem_instdir}:$(pwd)/TMPINSTDIR/%{gem_extdir_mri}/ + pushd ./TMPINSTDIR/%{gem_instdir} # kill unneeded make process rm -rf ./TMPBINDIR @@ -224,6 +226,10 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Thu Dec 31 2020 Mamoru TASAKA - 1.16.6-1.99 +- Rebuild for ruby 3.0 +- Set bootstrap logic for test suite + * Sun Aug 9 2020 Mamoru TASAKA - 1.16.6-1 - 1.16.6 From 7eed04ec57f9cf7fd9d4342caa621bb72be232bc Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 6 Jan 2021 19:43:26 +0900 Subject: [PATCH 083/127] F-34: rebuild against ruby 3.0 --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index f99de42..0eb9481 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -14,7 +14,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 1.99%{?dist} +Release: 2%{?dist} License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ %if 1 @@ -226,6 +226,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Wed Jan 06 2021 Mamoru TASAKA - 1.16.6-2 +- F-34: rebuild against ruby 3.0 + * Thu Dec 31 2020 Mamoru TASAKA - 1.16.6-1.99 - Rebuild for ruby 3.0 - Set bootstrap logic for test suite From e55329206df95a55b925e69fa5dd433b4e17691f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 15:41:59 +0000 Subject: [PATCH 084/127] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 0eb9481..51dc40f 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -14,7 +14,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ %if 1 @@ -226,6 +226,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.16.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jan 06 2021 Mamoru TASAKA - 1.16.6-2 - F-34: rebuild against ruby 3.0 From 5c5cea879b7b8cfeff868004899368bb062928e0 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 11 Mar 2021 23:23:47 +0900 Subject: [PATCH 085/127] 1.17.5 --- .gitignore | 2 ++ rubygem-cairo.spec | 42 +++++++----------------------------------- sources | 4 ++-- 3 files changed, 11 insertions(+), 37 deletions(-) diff --git a/.gitignore b/.gitignore index 2b3550c..1298f05 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,5 @@ /rcairo-1.16.5-test-missing-files.tar.gz /rcairo-1.16.6-test-missing-files.tar.gz /cairo-1.16.6.gem +/cairo-1.17.5.gem +/rcairo-1.17.5-test-missing-files.tar.gz diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 51dc40f..8703df2 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -2,10 +2,10 @@ %global header_dir %{ruby_vendorarchdir} %global gem_name cairo -%global gemver 1.16.6 +%global gemver 1.17.5 #%%global gem_githash af3e3fc059 -%global need_test_bootstrap 1 +%global need_test_bootstrap 0 # Upstream GIT http://github.com/rcairo/ @@ -14,7 +14,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 3%{?dist} +Release: 1%{?dist} License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ %if 1 @@ -29,21 +29,15 @@ Source11: rcairo-%{version}-test-missing-files.tar.gz # Source11 is generated by the below Source12: rcairo-create-missing-test-files.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: gcc BuildRequires: rubygems-devel BuildRequires: cairo-devel BuildRequires: ruby-devel +BuildRequires: rubygem(red-colors) # For %%check BuildRequires: rubygem(test-unit) BuildRequires: rubygem(test-unit-notify) @@ -136,7 +130,6 @@ do done # Move C extension -%if 0%{?fedora} >= 21 mkdir -p ./TMPINSTDIR/%{gem_extdir_mri} cp -a ./%{gem_extdir_mri}/* TMPINSTDIR/%{gem_extdir_mri}/ @@ -147,20 +140,6 @@ rm -f .%{gem_extdir_mri}/{gem_make.out,mkmf.log} popd -%else -pushd ./TMPINSTDIR -mkdir -p .%{gem_extdir_mri}/lib -mv .%{gem_instdir}/lib/%{gem_name}.so \ - ./%{gem_extdir_mri}/lib - -# Move header -mkdir -p ./%{header_dir} -mv ./%{gem_instdir}/lib/*.h \ - ./%{header_dir}/ -popd -%endif - - # cleanups rm -rf ./TMPINSTDIR/%{gem_instdir}/ext/ rm -f ./TMPINSTDIR/%{gem_instdir}/{Makefile*,extconf.rb} @@ -195,24 +174,14 @@ sed -i -e "\@require 'bundler/setup'@d" test/run-test.rb ruby ./test/run-test.rb %files -%if 0%{?fedora} >= 21 %{gem_extdir_mri}/ -%else -%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]* %exclude %{gem_instdir}/Gemfile %exclude %{gem_instdir}/Rakefile %{gem_instdir}/lib/ -%if 0%{?fedora} >= 20 %exclude %{gem_cache} -%else -%{gem_cache} -%endif %{gem_spec} %files doc @@ -226,6 +195,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Thu Mar 11 2021 Mamoru TASAKA - 1.17.5-1 +- 1.17.5 + * Wed Jan 27 2021 Fedora Release Engineering - 1.16.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 93f3325..eb0f566 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rcairo-1.16.6-test-missing-files.tar.gz) = e42f5a5ca7ce314dd766756a468237d25ba77a233ef62cba429d6a1c3f1dc4e5b9f34cb807b95357449e2ce2d0cebb1b00a0444a6a0ed0d6270e2fcad206b7d3 -SHA512 (cairo-1.16.6.gem) = f499daa83e865d58cc29d158ce649cab9f939464a08e5d7711f6cf255fb8dcfbf52457e3d2b81aef2018ad8d0762117776049b3681c9be6abdf4f0b12e43404c +SHA512 (cairo-1.17.5.gem) = f2ade6fb6b9fccd81a11061b277d4a9077936e0beef42c61225bd4d5630586a57a3fa192a20a0f7e4922313e2a8215268bc9a5d007d2805cf1f80714fd9ad1ba +SHA512 (rcairo-1.17.5-test-missing-files.tar.gz) = ad70a1470f01e6a4e7fbd1ed1ec1b60caaeadf1af1a0adaf2be5ad48f9ce474f023fe60d18110c1a80a7fbe24287edcbda913200f0baae335a0299efbdcf5497 From 007a8f90f46f2af965e46fefe040665581e020af Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 11:52:57 +0000 Subject: [PATCH 086/127] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 8703df2..675210c 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -14,7 +14,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ %if 1 @@ -195,6 +195,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.17.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Mar 11 2021 Mamoru TASAKA - 1.17.5-1 - 1.17.5 From 0b8802370d5737309be7c5fb77d07c1158e16224 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 18:20:21 +0000 Subject: [PATCH 087/127] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 675210c..58f1b2e 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -14,7 +14,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ %if 1 @@ -195,6 +195,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 1.17.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 1.17.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 30a2899f9d9a51af1a6e4c1f51844f5ac1bf9a68 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 23 Jan 2022 15:30:17 +0900 Subject: [PATCH 088/127] F-36: rebuild for ruby31 --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 58f1b2e..929b32f 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -14,7 +14,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ %if 1 @@ -195,6 +195,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Sun Jan 23 2022 Mamoru TASAKA - 1.17.5-4 +- F-36: rebuild for ruby31 + * Fri Jan 21 2022 Fedora Release Engineering - 1.17.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From d4e14508d5c19ec1b026044b9c876fab02f1383f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 23 Jan 2022 15:36:23 +0900 Subject: [PATCH 089/127] modernize spec --- rubygem-cairo.spec | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 929b32f..34ceaef 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -86,33 +86,19 @@ Header files and libraries for building a extension library for the ruby-cairo %prep -%setup -q -c -T - -TOPDIR=$(pwd) -mkdir tmpunpackdir -pushd tmpunpackdir - -gem unpack %{SOURCE0} -cd %{gem_name}-%{version} +%setup -q -n %{gem_name}-%{version} +mv ../%{gem_name}-%{version}.gemspec . #Patches, etc -gem specification -l --ruby %{SOURCE0} > %{gem_name}.gemspec - # pkg-config dependency should be for development -find . -name \*.gemspec | \ - xargs sed -i \ - -e '\@pkg-config@s|runtime_dependency|development_dependency|' \ - -e '\@native-package-installer@s|runtime_dependency|development_dependency|' \ - %{nil} - -gem build %{gem_name}.gemspec -mv %{gem_name}-%{version}.gem $TOPDIR - -popd -rm -rf tmpunpackdir +sed -i %{gem_name}-%{version}.gemspec \ + -e '\@pkg-config@s|runtime_dependency|development_dependency|' \ + -e '\@native-package-installer@s|runtime_dependency|development_dependency|' \ + %{nil} %build +gem build %{gem_name}-%{version}.gemspec %gem_install # Once install to TMPINSTDIR for %%check From 686f7c3c9c197ae7ea93fd761a8aca42106ee4ae Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 23 Jan 2022 15:36:57 +0900 Subject: [PATCH 090/127] needstrap needed --- rubygem-cairo.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 34ceaef..6f08c82 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -5,7 +5,7 @@ %global gemver 1.17.5 #%%global gem_githash af3e3fc059 -%global need_test_bootstrap 0 +%global need_test_bootstrap 1 # Upstream GIT http://github.com/rcairo/ @@ -14,7 +14,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 4%{?dist} +Release: 3.1%{?dist} License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ %if 1 From 148f141e48439184c65c8458229fe9292a3f7f0c Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 27 Jan 2022 08:50:13 +0900 Subject: [PATCH 091/127] enable test again --- rubygem-cairo.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 6f08c82..34ceaef 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -5,7 +5,7 @@ %global gemver 1.17.5 #%%global gem_githash af3e3fc059 -%global need_test_bootstrap 1 +%global need_test_bootstrap 0 # Upstream GIT http://github.com/rcairo/ @@ -14,7 +14,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 3.1%{?dist} +Release: 4%{?dist} License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ %if 1 From fd7c1e153c8892e6168c65f8ec42fbe1e41cfe48 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 01:20:51 +0000 Subject: [PATCH 092/127] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 34ceaef..84c4684 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -14,7 +14,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ %if 1 @@ -181,6 +181,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.17.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sun Jan 23 2022 Mamoru TASAKA - 1.17.5-4 - F-36: rebuild for ruby31 From 1421d5034731eb6da9122d85117f8c88c701819f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 28 Jul 2022 16:24:59 +0900 Subject: [PATCH 093/127] Modify test script for cairo 1.17.6 change --- rubygem-cairo.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 84c4684..ef41a68 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -14,7 +14,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ %if 1 @@ -98,6 +98,12 @@ sed -i %{gem_name}-%{version}.gemspec \ %{nil} %build +# cairo 1.17.6 changed the default SVG unit to user unit +# https://gitlab.freedesktop.org/cairo/cairo/-/commit/d397ab6d10123e6bbcf9ae446cc8ffd981f18222 +if pkg-config --atleast-version 1.17.6 cairo ; then + sed -i test/test_svg_surface.rb -e 's|Cairo::SVGUnit::PT|Cairo::SVGUnit::USER|' +fi + gem build %{gem_name}-%{version}.gemspec %gem_install @@ -181,6 +187,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Thu Jul 28 2022 Mamoru TASAKA - 1.17.5-6 +- Modify test script for cairo 1.17.6 change + * Sat Jul 23 2022 Fedora Release Engineering - 1.17.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 64bae1281df873788c7a84e1793027d5a4ee380b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 28 Jul 2022 16:26:14 +0900 Subject: [PATCH 094/127] add more reference --- rubygem-cairo.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index ef41a68..d1e809b 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -100,6 +100,8 @@ sed -i %{gem_name}-%{version}.gemspec \ %build # cairo 1.17.6 changed the default SVG unit to user unit # https://gitlab.freedesktop.org/cairo/cairo/-/commit/d397ab6d10123e6bbcf9ae446cc8ffd981f18222 +# https://gitlab.freedesktop.org/cairo/cairo/-/issues/545 +# https://github.com/rcairo/rcairo/issues/75 if pkg-config --atleast-version 1.17.6 cairo ; then sed -i test/test_svg_surface.rb -e 's|Cairo::SVGUnit::PT|Cairo::SVGUnit::USER|' fi From 1fc17200c2fb29faeec3c3bb237325d01d19e7a3 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 30 Jul 2022 23:44:42 +0900 Subject: [PATCH 095/127] 1.17.6 --- .gitignore | 41 ++--------------------------------------- rubygem-cairo.spec | 15 +++++---------- sources | 4 ++-- 3 files changed, 9 insertions(+), 51 deletions(-) diff --git a/.gitignore b/.gitignore index 1298f05..0720ee1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,39 +1,2 @@ -/cairo-1.10.0.gem -/cairo-1.10.2.gem -/cairo-1.12.2-af3e3fc059.gem -/cairo-1.12.2.gem -/cairo-1.12.3.gem -/cairo-1.12.4.gem -/cairo-1.12.6.gem -/cairo-1.12.8.gem -/cairo-1.12.9.gem -/cairo-1.14.0.gem -/cairo-1.14.1.gem -/cairo-1.14.3.gem -/cairo-1.15.2.gem -/cairo-1.15.3.gem -/cairo-1.15.4.gem -/cairo-1.15.5.gem -/cairo-1.15.7.gem -/cairo-1.15.9.gem -/rcairo-1.15.9-test-missing-files.tar.gz -/cairo-1.15.10.gem -/rcairo-1.15.10-test-missing-files.tar.gz -/cairo-1.15.11.gem -/rcairo-1.15.11-test-missing-files.tar.gz -/cairo-1.15.12.gem -/rcairo-1.15.12-test-missing-files.tar.gz -/cairo-1.15.13.gem -/rcairo-1.15.13-test-missing-files.tar.gz -/cairo-1.15.14.gem -/rcairo-1.15.14-test-missing-files.tar.gz -/cairo-1.16.2.gem -/rcairo-1.16.2-test-missing-files.tar.gz -/cairo-1.16.4.gem -/rcairo-1.16.4-test-missing-files.tar.gz -/cairo-1.16.5.gem -/rcairo-1.16.5-test-missing-files.tar.gz -/rcairo-1.16.6-test-missing-files.tar.gz -/cairo-1.16.6.gem -/cairo-1.17.5.gem -/rcairo-1.17.5-test-missing-files.tar.gz +/cairo-*gem +/rcairo-*-test-missing-files.tar.gz diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index d1e809b..344596a 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -2,7 +2,7 @@ %global header_dir %{ruby_vendorarchdir} %global gem_name cairo -%global gemver 1.17.5 +%global gemver 1.17.6 #%%global gem_githash af3e3fc059 %global need_test_bootstrap 0 @@ -14,7 +14,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 6%{?dist} +Release: 1%{?dist} License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ %if 1 @@ -98,14 +98,6 @@ sed -i %{gem_name}-%{version}.gemspec \ %{nil} %build -# cairo 1.17.6 changed the default SVG unit to user unit -# https://gitlab.freedesktop.org/cairo/cairo/-/commit/d397ab6d10123e6bbcf9ae446cc8ffd981f18222 -# https://gitlab.freedesktop.org/cairo/cairo/-/issues/545 -# https://github.com/rcairo/rcairo/issues/75 -if pkg-config --atleast-version 1.17.6 cairo ; then - sed -i test/test_svg_surface.rb -e 's|Cairo::SVGUnit::PT|Cairo::SVGUnit::USER|' -fi - gem build %{gem_name}-%{version}.gemspec %gem_install @@ -189,6 +181,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Sat Jul 30 2022 Mamoru TASAKA - 1.17.6-1 +- 1.17.6 + * Thu Jul 28 2022 Mamoru TASAKA - 1.17.5-6 - Modify test script for cairo 1.17.6 change diff --git a/sources b/sources index eb0f566..fcc3524 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (cairo-1.17.5.gem) = f2ade6fb6b9fccd81a11061b277d4a9077936e0beef42c61225bd4d5630586a57a3fa192a20a0f7e4922313e2a8215268bc9a5d007d2805cf1f80714fd9ad1ba -SHA512 (rcairo-1.17.5-test-missing-files.tar.gz) = ad70a1470f01e6a4e7fbd1ed1ec1b60caaeadf1af1a0adaf2be5ad48f9ce474f023fe60d18110c1a80a7fbe24287edcbda913200f0baae335a0299efbdcf5497 +SHA512 (cairo-1.17.6.gem) = 228696ec0f58d85dbe688444229630b26a610cc39065917cda662a3a89c6460ba817c1884d31f6fb526214b385886d7fa6c112be2220d8983f677a9b69b784ff +SHA512 (rcairo-1.17.6-test-missing-files.tar.gz) = 8fe109127e1676655bb57afafec84b4c9880d6afc25a73dfc623af9b8ff583966f9ae4534fd7986b14ffe0d7abbba5b3a81060a34297fbbf7efedaef9eac6683 From ac36a5f93a0e48565adf9ab93fb059d59ce976c3 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 4 Aug 2022 14:05:39 +0900 Subject: [PATCH 096/127] 1.17.7 --- rubygem-cairo.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 344596a..926a63e 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -2,7 +2,7 @@ %global header_dir %{ruby_vendorarchdir} %global gem_name cairo -%global gemver 1.17.6 +%global gemver 1.17.7 #%%global gem_githash af3e3fc059 %global need_test_bootstrap 0 @@ -181,6 +181,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Thu Aug 4 2022 Mamoru TASAKA - 1.17.7-1 +- 1.17.7 + * Sat Jul 30 2022 Mamoru TASAKA - 1.17.6-1 - 1.17.6 diff --git a/sources b/sources index fcc3524..3fcbed0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (cairo-1.17.6.gem) = 228696ec0f58d85dbe688444229630b26a610cc39065917cda662a3a89c6460ba817c1884d31f6fb526214b385886d7fa6c112be2220d8983f677a9b69b784ff -SHA512 (rcairo-1.17.6-test-missing-files.tar.gz) = 8fe109127e1676655bb57afafec84b4c9880d6afc25a73dfc623af9b8ff583966f9ae4534fd7986b14ffe0d7abbba5b3a81060a34297fbbf7efedaef9eac6683 +SHA512 (cairo-1.17.7.gem) = 0a70bfe6e06ef566bd11b9d9bcda97758809081650015b59ff340d49effab9995d59e3b798291c2ef1c29cd6b8ca44cdefee8199c293f7cbce03cee853d19b2b +SHA512 (rcairo-1.17.7-test-missing-files.tar.gz) = c97910fc3d12c69f59bffa3654211746ad0317a537359d160ddefacca2c265e820369356c259381eb489e5bba902f57f3a73de74f39dd18ad8689a7d51ca55ef From d579596aab94b04b7f8bebb3e1c44171abf25185 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 4 Sep 2022 14:59:39 +0900 Subject: [PATCH 097/127] 1.17.8 --- rubygem-cairo.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 926a63e..98412d1 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -2,7 +2,7 @@ %global header_dir %{ruby_vendorarchdir} %global gem_name cairo -%global gemver 1.17.7 +%global gemver 1.17.8 #%%global gem_githash af3e3fc059 %global need_test_bootstrap 0 @@ -181,6 +181,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Sun Sep 4 2022 Mamoru TASAKA - 1.17.8-1 +- 1.17.8 + * Thu Aug 4 2022 Mamoru TASAKA - 1.17.7-1 - 1.17.7 diff --git a/sources b/sources index 3fcbed0..fad12d2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (cairo-1.17.7.gem) = 0a70bfe6e06ef566bd11b9d9bcda97758809081650015b59ff340d49effab9995d59e3b798291c2ef1c29cd6b8ca44cdefee8199c293f7cbce03cee853d19b2b -SHA512 (rcairo-1.17.7-test-missing-files.tar.gz) = c97910fc3d12c69f59bffa3654211746ad0317a537359d160ddefacca2c265e820369356c259381eb489e5bba902f57f3a73de74f39dd18ad8689a7d51ca55ef +SHA512 (cairo-1.17.8.gem) = a2b756dc1cf1abb98e4b60b9b56f5f610058bd840b67c991d6bfb3da2523b0f77a5854147f9d14ca461d573e51fbe3ba35c83659af5c031086710970fac6665a +SHA512 (rcairo-1.17.8-test-missing-files.tar.gz) = b97e6769042b29fdf95f49bd288e6d4155869db31ca60297ffa7207586a5e579059447166d0e97322d8fe6f6b7af15ed26a8d74036fe27ac42072aede8a25f00 From f7f704305338aa715ea85aad9aa27937ef0c63c4 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 29 Sep 2022 22:43:10 +0900 Subject: [PATCH 098/127] Once kill test suite dependency for now --- rubygem-cairo.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 98412d1..4d266ca 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -5,7 +5,7 @@ %global gemver 1.17.8 #%%global gem_githash af3e3fc059 -%global need_test_bootstrap 0 +%global need_test_bootstrap 1 # Upstream GIT http://github.com/rcairo/ @@ -14,7 +14,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ %if 1 @@ -181,6 +181,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Thu Sep 29 2022 Mamoru TASAKA - 1.17.8-2 +- Once kill test suite dependency for now + * Sun Sep 4 2022 Mamoru TASAKA - 1.17.8-1 - 1.17.8 From 73b02d520cf01f6a44b11348cbee83e96eec6a35 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 4 Jan 2023 09:06:10 +0900 Subject: [PATCH 099/127] Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.2 --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 4d266ca..7c6475f 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -14,7 +14,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ %if 1 @@ -181,6 +181,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Wed Jan 04 2023 Mamoru TASAKA - 1.17.8-3 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.2 + * Thu Sep 29 2022 Mamoru TASAKA - 1.17.8-2 - Once kill test suite dependency for now From 587548412258648785755405ba5a5241a2116ee1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 20:14:52 +0000 Subject: [PATCH 100/127] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 7c6475f..0765837 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -14,7 +14,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 or Ruby URL: http://cairographics.org/rcairo/ %if 1 @@ -181,6 +181,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 1.17.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jan 04 2023 Mamoru TASAKA - 1.17.8-3 - Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.2 From 1d64d91074eb2d7bba20a32af836abe1b21d7805 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 24 May 2023 16:43:42 +0900 Subject: [PATCH 101/127] Enable test suite again SPDX migration spec file cleanup --- rubygem-cairo.spec | 49 ++++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 0765837..03de000 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -5,7 +5,7 @@ %global gemver 1.17.8 #%%global gem_githash af3e3fc059 -%global need_test_bootstrap 1 +%global need_test_bootstrap 0 # Upstream GIT http://github.com/rcairo/ @@ -14,14 +14,13 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: %{gemver} -Release: 4%{?dist} -License: GPLv2 or Ruby +Release: 5%{?dist} +# From gemspec +# SPDX confirmed +License: GPL-2.0-or-later OR Ruby + URL: http://cairographics.org/rcairo/ -%if 1 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 # FIXME @@ -76,11 +75,6 @@ Requires: ruby-devel # Obsoletes / Provides # ruby(cairo-devel) Provides is for compatibility # -# Actually ruby(cairo-devel) provides should not exist - -# Remove on F-17 and above -Obsoletes: ruby-cairo-devel < 1.9 -Provides: ruby-cairo-devel = %{version}-%{release} - %description devel Header files and libraries for building a extension library for the ruby-cairo @@ -126,13 +120,21 @@ rm -f .%{gem_extdir_mri}/{gem_make.out,mkmf.log} popd -# cleanups -rm -rf ./TMPINSTDIR/%{gem_instdir}/ext/ -rm -f ./TMPINSTDIR/%{gem_instdir}/{Makefile*,extconf.rb} - %install cp -a ./TMPINSTDIR/* %{buildroot}/ +# cleanups +rm -f %{buildroot}%{gem_cache} +pushd %{buildroot}%{gem_instdir} +rm -rf \ + Gemfile \ + Rakefile \ + *.gemspec \ + ext/ \ + test/ \ + %{nil} +popd + %check %if 0%{?need_test_bootstrap} >= 1 exit 0 @@ -163,24 +165,25 @@ ruby ./test/run-test.rb %{gem_extdir_mri}/ %dir %{gem_instdir}/ -%doc %{gem_instdir}/[A-Z]* -%exclude %{gem_instdir}/Gemfile -%exclude %{gem_instdir}/Rakefile +%doc %{gem_instdir}/[A-CN-Z]* +%license %{gem_instdir}/GPL + %{gem_instdir}/lib/ -%exclude %{gem_cache} %{gem_spec} %files doc -%{gem_instdir}/Gemfile -%{gem_instdir}/Rakefile %{gem_instdir}/samples/ -%{gem_instdir}/test/ %{gem_docdir}/ %files devel %{header_dir}/rb_cairo.h %changelog +* Wed May 24 2023 Mamoru TASAKA - 1.17.8-5 +- Enable test suite again +- SPDX migration +- spec file cleanup + * Fri Jan 20 2023 Fedora Release Engineering - 1.17.8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 09a6ec824266b8b40b4d7711d4e219c29cbd0019 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 15 Jun 2023 15:58:28 +0900 Subject: [PATCH 102/127] 1.17.9 --- rubygem-cairo.spec | 8 +++++--- sources | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 03de000..37e9476 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -2,7 +2,6 @@ %global header_dir %{ruby_vendorarchdir} %global gem_name cairo -%global gemver 1.17.8 #%%global gem_githash af3e3fc059 %global need_test_bootstrap 0 @@ -13,8 +12,8 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} -Version: %{gemver} -Release: 5%{?dist} +Version: 1.17.9 +Release: 1%{?dist} # From gemspec # SPDX confirmed License: GPL-2.0-or-later OR Ruby @@ -179,6 +178,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Thu Jun 15 2023 Mamoru TASAKA - 1.17.9-1 +- 1.17.9 + * Wed May 24 2023 Mamoru TASAKA - 1.17.8-5 - Enable test suite again - SPDX migration diff --git a/sources b/sources index fad12d2..6adb926 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (cairo-1.17.8.gem) = a2b756dc1cf1abb98e4b60b9b56f5f610058bd840b67c991d6bfb3da2523b0f77a5854147f9d14ca461d573e51fbe3ba35c83659af5c031086710970fac6665a -SHA512 (rcairo-1.17.8-test-missing-files.tar.gz) = b97e6769042b29fdf95f49bd288e6d4155869db31ca60297ffa7207586a5e579059447166d0e97322d8fe6f6b7af15ed26a8d74036fe27ac42072aede8a25f00 +SHA512 (rcairo-1.17.9-test-missing-files.tar.gz) = 47ba8fff8cc77104ef8a00e2bc26a0f7f7fcfbccf5c0694f34e0f3ad4274f93bee443a5b6b9d111b2eaa6e4ddc90dc3c40c8d7bcb145f8cadfe44f023aef475b +SHA512 (cairo-1.17.9.gem) = d716066b294382f1f655bfe9e96f7caf428ad5206cf6aec11aa42f2136618e3f9f6c882ab32c251f5a95e56caf99d1ad5bbfe06764a4577718ff97cbc2b91dd4 From 3a7af29aa705b090ac55c533b053a4df89bfb1ea Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 19 Jun 2023 15:33:11 +0900 Subject: [PATCH 103/127] 1.17.12 --- rubygem-cairo.spec | 5 ++++- sources | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 37e9476..996cb05 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -12,7 +12,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} -Version: 1.17.9 +Version: 1.17.12 Release: 1%{?dist} # From gemspec # SPDX confirmed @@ -178,6 +178,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Mon Jun 19 2023 Mamoru TASAKA - 1.17.12-1 +- 1.17.12 + * Thu Jun 15 2023 Mamoru TASAKA - 1.17.9-1 - 1.17.9 diff --git a/sources b/sources index 6adb926..a6a7938 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rcairo-1.17.9-test-missing-files.tar.gz) = 47ba8fff8cc77104ef8a00e2bc26a0f7f7fcfbccf5c0694f34e0f3ad4274f93bee443a5b6b9d111b2eaa6e4ddc90dc3c40c8d7bcb145f8cadfe44f023aef475b -SHA512 (cairo-1.17.9.gem) = d716066b294382f1f655bfe9e96f7caf428ad5206cf6aec11aa42f2136618e3f9f6c882ab32c251f5a95e56caf99d1ad5bbfe06764a4577718ff97cbc2b91dd4 +SHA512 (cairo-1.17.12.gem) = 6bad8c0f15e8617266a85f0ba0bf41db1b508bdb174aa8dbfad8a560a1510cec852502cf39e93b0317c046035bfd97552b92167debb7de4d887c319648b10b56 +SHA512 (rcairo-1.17.12-test-missing-files.tar.gz) = 12b3ba99eaebb24c01d984167b5fbed96a87a8764f4305f1da40033964710406ced79f6d7112ed2b14e3b239a5ff46d6950c997f89d29c710e67beb37d5aaf78 From 3236688d522cf9b6f905d4cffbc56da75e5d322a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 17:24:21 +0000 Subject: [PATCH 104/127] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 996cb05..943c7b4 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -13,7 +13,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: 1.17.12 -Release: 1%{?dist} +Release: 2%{?dist} # From gemspec # SPDX confirmed License: GPL-2.0-or-later OR Ruby @@ -178,6 +178,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 1.17.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Mon Jun 19 2023 Mamoru TASAKA - 1.17.12-1 - 1.17.12 From 7a6520b5f999c8c74fc7985562596f34af04f3bc Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 14 Sep 2023 21:23:08 +0900 Subject: [PATCH 105/127] once introduce bootstrap --- rubygem-cairo.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 943c7b4..9a28ac8 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -5,6 +5,9 @@ #%%global gem_githash af3e3fc059 %global need_test_bootstrap 0 +%if 0%{?fedora} >= 40 +%global need_test_bootstrap 1 +%endif # Upstream GIT http://github.com/rcairo/ From 82b557eebcf609056c50f93aa87553eea48c1b4d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 19 Dec 2023 15:42:40 +0900 Subject: [PATCH 106/127] use recent bootstrap style --- rubygem-cairo.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 9a28ac8..0f2e8f0 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -4,9 +4,9 @@ %global gem_name cairo #%%global gem_githash af3e3fc059 -%global need_test_bootstrap 0 +%bcond_with bootstrap %if 0%{?fedora} >= 40 -%global need_test_bootstrap 1 +%bcond_with bootstrap %endif # Upstream GIT http://github.com/rcairo/ @@ -27,7 +27,7 @@ Source0: http://rubygems.org/downloads/%{gem_name}-%{version}.gem Source1: create-cairo-gem.sh # FIXME Source11: rcairo-%{version}-test-missing-files.tar.gz -# Source11 is generated by the below +# Source11 is generated by $bash %%SOURCE12 %%version Source12: rcairo-create-missing-test-files.sh Requires: ruby(release) @@ -45,7 +45,7 @@ BuildRequires: rubygem(test-unit-notify) BuildRequires: rubygem(pkg-config) BuildRequires: rubygem(native-package-installer) # Circular dependency -%if 0%{?need_test_bootstrap} < 1 +%if %{without bootstrap} BuildRequires: rubygem(poppler) # Make sure at least one font is available for test/test_context.rb:57 # `initialize': out of memory (NoMemoryError) @@ -138,7 +138,7 @@ rm -rf \ popd %check -%if 0%{?need_test_bootstrap} >= 1 +%if %{with bootstrap} exit 0 %endif From 1a98021c1e5d034ad8476cef895560ed667cf262 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 19 Dec 2023 16:04:43 +0900 Subject: [PATCH 107/127] 1.17.13 --- rubygem-cairo.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 0f2e8f0..9f2704c 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -15,8 +15,8 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} -Version: 1.17.12 -Release: 2%{?dist} +Version: 1.17.13 +Release: 1%{?dist} # From gemspec # SPDX confirmed License: GPL-2.0-or-later OR Ruby @@ -181,6 +181,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Tue Dec 19 2023 Mamoru TASAKA - 1.17.13-1 +- 1.17.13 + * Fri Jul 21 2023 Fedora Release Engineering - 1.17.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index a6a7938..6b70350 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (cairo-1.17.12.gem) = 6bad8c0f15e8617266a85f0ba0bf41db1b508bdb174aa8dbfad8a560a1510cec852502cf39e93b0317c046035bfd97552b92167debb7de4d887c319648b10b56 -SHA512 (rcairo-1.17.12-test-missing-files.tar.gz) = 12b3ba99eaebb24c01d984167b5fbed96a87a8764f4305f1da40033964710406ced79f6d7112ed2b14e3b239a5ff46d6950c997f89d29c710e67beb37d5aaf78 +SHA512 (cairo-1.17.13.gem) = 82fb621f97b6eb292565fd0f90f5e686c2cd4cd8aa61fa0ab6e25aac665aa9f7e780481a6571fd443be8c53070f29a2dfea5a54949350fe783b12aeb6aba3769 +SHA512 (rcairo-1.17.13-test-missing-files.tar.gz) = 6d701b9ac76a4a4e62432c002b6a7d3bb3d985c2d8caef7bac83b60cd65e0f974b03753bfd2687676b88ebac10a0601a7b2e0d063ff953cdba0f742611ca2a75 From 8cf264bdee8e69367388edfbd696b343b3c29b8e Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 3 Jan 2024 21:05:35 +0900 Subject: [PATCH 108/127] Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.3 --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 9f2704c..19e4ca3 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -16,7 +16,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: 1.17.13 -Release: 1%{?dist} +Release: 2%{?dist} # From gemspec # SPDX confirmed License: GPL-2.0-or-later OR Ruby @@ -181,6 +181,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Wed Jan 03 2024 Mamoru TASAKA - 1.17.13-2 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.3 + * Tue Dec 19 2023 Mamoru TASAKA - 1.17.13-1 - 1.17.13 From 9af1abd431021af764e02f56d9a1253ac2989af0 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 3 Jan 2024 21:05:55 +0900 Subject: [PATCH 109/127] bootstrap --- rubygem-cairo.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 19e4ca3..1624fd8 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -6,7 +6,7 @@ %bcond_with bootstrap %if 0%{?fedora} >= 40 -%bcond_with bootstrap +%bcond_without bootstrap %endif # Upstream GIT http://github.com/rcairo/ From 432bb42ea3faada1b73b655e11cc61cca389f6b9 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 3 Jan 2024 23:17:11 +0900 Subject: [PATCH 110/127] kill bootstrap --- rubygem-cairo.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 1624fd8..19e4ca3 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -6,7 +6,7 @@ %bcond_with bootstrap %if 0%{?fedora} >= 40 -%bcond_without bootstrap +%bcond_with bootstrap %endif # Upstream GIT http://github.com/rcairo/ From e64bc4d3584bd376d9ab771a2e1eceb99abb43b6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 12:35:50 +0000 Subject: [PATCH 111/127] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 19e4ca3..5b864dd 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -16,7 +16,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: 1.17.13 -Release: 2%{?dist} +Release: 3%{?dist} # From gemspec # SPDX confirmed License: GPL-2.0-or-later OR Ruby @@ -181,6 +181,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 1.17.13-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jan 03 2024 Mamoru TASAKA - 1.17.13-2 - Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.3 From ea2dba78e08ec2107cafd16a61f6ba8605702585 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 16:38:03 +0000 Subject: [PATCH 112/127] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 5b864dd..1d1963c 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -16,7 +16,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: 1.17.13 -Release: 3%{?dist} +Release: 4%{?dist} # From gemspec # SPDX confirmed License: GPL-2.0-or-later OR Ruby @@ -181,6 +181,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Fri Jan 26 2024 Fedora Release Engineering - 1.17.13-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 1.17.13-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 9c70542fb2a7cfefd61d87ad3dc661d1efb356ef Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 6 Feb 2024 15:04:52 +0900 Subject: [PATCH 113/127] Execute tests even when poppler is unavailable during bootstrap --- rubygem-cairo.spec | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 9f2704c..7d9bf36 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -47,10 +47,10 @@ BuildRequires: rubygem(native-package-installer) # Circular dependency %if %{without bootstrap} BuildRequires: rubygem(poppler) +%endif # Make sure at least one font is available for test/test_context.rb:57 # `initialize': out of memory (NoMemoryError) BuildRequires: dejavu-serif-fonts -%endif Requires: rubygems Provides: rubygem(%{gem_name}) = %{version}-%{release} @@ -138,10 +138,6 @@ rm -rf \ popd %check -%if %{with bootstrap} -exit 0 -%endif - export RUBYLIB=$(pwd)/TMPINSTDIR/%{gem_instdir}:$(pwd)/TMPINSTDIR/%{gem_extdir_mri}/ pushd ./TMPINSTDIR/%{gem_instdir} @@ -161,6 +157,18 @@ cp -a rcairo/test/* test 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 +%if %{with bootstrap} +# Kill tests which needs poppler +sed -i test/helper.rb -e '\@poppler@s@^@#@' +for f in \ + test/test_context.rb \ + test/test_pdf_surface.rb \ + %{nil} +do + mv $f $f.orig +done +%endif + ruby ./test/run-test.rb %files From 21c399b468672488e41ab28fab3188a7bab17cec Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 6 Feb 2024 15:06:26 +0900 Subject: [PATCH 114/127] Bump and rebuild --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 662a574..449785c 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -16,7 +16,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: 1.17.13 -Release: 4%{?dist} +Release: 5%{?dist} # From gemspec # SPDX confirmed License: GPL-2.0-or-later OR Ruby @@ -189,6 +189,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Tue Feb 06 2024 Mamoru TASAKA - 1.17.13-5 +- Bump and rebuild + * Fri Jan 26 2024 Fedora Release Engineering - 1.17.13-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 95a17c0fe06afd0fbdd4cda120e309db0f17d44a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 19:06:40 +0000 Subject: [PATCH 115/127] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 449785c..5c45e2a 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -16,7 +16,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: 1.17.13 -Release: 5%{?dist} +Release: 6%{?dist} # From gemspec # SPDX confirmed License: GPL-2.0-or-later OR Ruby @@ -189,6 +189,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 1.17.13-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Feb 06 2024 Mamoru TASAKA - 1.17.13-5 - Bump and rebuild From 1a58960fb3908e927f24c5146227e65b7485ecae Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 2 Nov 2024 16:57:03 +0900 Subject: [PATCH 116/127] once kill poppler test --- rubygem-cairo.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 449785c..9945095 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -5,7 +5,7 @@ #%%global gem_githash af3e3fc059 %bcond_with bootstrap -%if 0%{?fedora} >= 40 +%if 0%{?fedora} >= 42 %bcond_with bootstrap %endif From 487469612092e62b3c3266110dc33c998aa85c30 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 2 Nov 2024 17:21:22 +0900 Subject: [PATCH 117/127] fix logic... --- rubygem-cairo.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index b93c5fc..9f3202d 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -6,7 +6,7 @@ %bcond_with bootstrap %if 0%{?fedora} >= 42 -%bcond_with bootstrap +%bcond_without bootstrap %endif # Upstream GIT http://github.com/rcairo/ From abe2d9dc69f12507169b1074e8737409f5c467c1 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 2 Nov 2024 17:21:48 +0900 Subject: [PATCH 118/127] bump release and build --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 9f3202d..37e9d79 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -16,7 +16,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: 1.17.13 -Release: 6%{?dist} +Release: 7%{?dist} # From gemspec # SPDX confirmed License: GPL-2.0-or-later OR Ruby @@ -189,6 +189,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Sat Nov 02 2024 Mamoru TASAKA - 1.17.13-7 +- Kill loop dependency for now + * Fri Jul 19 2024 Fedora Release Engineering - 1.17.13-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 340ae3f823e5b5b411d04d8e8ce0055d599d3a0b Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 8 Jan 2025 08:28:54 +0900 Subject: [PATCH 119/127] Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4 --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 37e9d79..f3ccb96 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -16,7 +16,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: 1.17.13 -Release: 7%{?dist} +Release: 8%{?dist} # From gemspec # SPDX confirmed License: GPL-2.0-or-later OR Ruby @@ -189,6 +189,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Tue Jan 07 2025 Mamoru TASAKA - 1.17.13-8 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4 + * Sat Nov 02 2024 Mamoru TASAKA - 1.17.13-7 - Kill loop dependency for now From 123ccf2a3a8e1c6e78492fd3b4c3d20c00bad371 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 8 Jan 2025 10:40:27 +0900 Subject: [PATCH 120/127] kill bootstrap --- rubygem-cairo.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index f3ccb96..5d07212 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -6,7 +6,7 @@ %bcond_with bootstrap %if 0%{?fedora} >= 42 -%bcond_without bootstrap +%bcond_with bootstrap %endif # Upstream GIT http://github.com/rcairo/ From b053fc987d728c45a35ff2dc75a7a6a5bee8d647 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 9 Jan 2025 14:29:19 +0900 Subject: [PATCH 121/127] 1.17.4 --- rubygem-cairo.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 5d07212..0ffdd66 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -15,8 +15,8 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} -Version: 1.17.13 -Release: 8%{?dist} +Version: 1.17.14 +Release: 1%{?dist} # From gemspec # SPDX confirmed License: GPL-2.0-or-later OR Ruby @@ -189,6 +189,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Thu Jan 09 2025 Mamoru TASAKA - 1.17.14-1 +- 1.17.4 + * Tue Jan 07 2025 Mamoru TASAKA - 1.17.13-8 - Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4 diff --git a/sources b/sources index 6b70350..178300d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (cairo-1.17.13.gem) = 82fb621f97b6eb292565fd0f90f5e686c2cd4cd8aa61fa0ab6e25aac665aa9f7e780481a6571fd443be8c53070f29a2dfea5a54949350fe783b12aeb6aba3769 -SHA512 (rcairo-1.17.13-test-missing-files.tar.gz) = 6d701b9ac76a4a4e62432c002b6a7d3bb3d985c2d8caef7bac83b60cd65e0f974b03753bfd2687676b88ebac10a0601a7b2e0d063ff953cdba0f742611ca2a75 +SHA512 (rcairo-1.17.14-test-missing-files.tar.gz) = 99d531c4518b7184d60cada0ee70a1aec37bbad770fbf460b67cb588236aa9776d772244ecaa8179a98399f08db57a295a3eccbacc3f4c25ed156792526b8381 +SHA512 (cairo-1.17.14.gem) = 66a41f108af4d1ea7189bbdcb8e60c3029f042e1be6db7e40739e0f320b1a3cee19e5e76c5bcf4336c24464d9ef54d8c95c7149f923737824d88b320163746a7 From 01fe1ca49d2a99edccca58e8f3dc91d42d01df54 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 23:02:54 +0000 Subject: [PATCH 122/127] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 0ffdd66..7732156 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -16,7 +16,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: 1.17.14 -Release: 1%{?dist} +Release: 2%{?dist} # From gemspec # SPDX confirmed License: GPL-2.0-or-later OR Ruby @@ -189,6 +189,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 1.17.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jan 09 2025 Mamoru TASAKA - 1.17.14-1 - 1.17.4 From a710b490d0ce0c62327bab8b9d42fae13b5a4385 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 13 Mar 2025 10:14:42 +0900 Subject: [PATCH 123/127] 1.18.4 --- rubygem-cairo.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 7732156..507826e 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -15,8 +15,8 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} -Version: 1.17.14 -Release: 2%{?dist} +Version: 1.18.4 +Release: 1%{?dist} # From gemspec # SPDX confirmed License: GPL-2.0-or-later OR Ruby @@ -189,6 +189,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Wed Mar 12 2025 Mamoru TASAKA - 1.18.4-1 +- 1.18.4 + * Sat Jan 18 2025 Fedora Release Engineering - 1.17.14-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 178300d..2b478d9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rcairo-1.17.14-test-missing-files.tar.gz) = 99d531c4518b7184d60cada0ee70a1aec37bbad770fbf460b67cb588236aa9776d772244ecaa8179a98399f08db57a295a3eccbacc3f4c25ed156792526b8381 -SHA512 (cairo-1.17.14.gem) = 66a41f108af4d1ea7189bbdcb8e60c3029f042e1be6db7e40739e0f320b1a3cee19e5e76c5bcf4336c24464d9ef54d8c95c7149f923737824d88b320163746a7 +SHA512 (cairo-1.18.4.gem) = 665a791f54567bb81e8533e56964640c14dce195da8b5cca968930dcaef9a28b705c5a04901a796f0cc645e1168fd127da95f0d1f6dbe5a71ef27d8f4624adb7 +SHA512 (rcairo-1.18.4-test-missing-files.tar.gz) = 75b42678f48e868e24f9f2a21a813bb770fc6b453dccc551760f74a825839e86cfbebfe20df63640aec58dd297d5fe19d9f4ba767e5286d9670e051f05711a1e From 8754feae625d3310b1d144a781df9730b7c6c9e0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 12:18:22 +0000 Subject: [PATCH 124/127] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 507826e..7d3a04d 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -16,7 +16,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: 1.18.4 -Release: 1%{?dist} +Release: 2%{?dist} # From gemspec # SPDX confirmed License: GPL-2.0-or-later OR Ruby @@ -189,6 +189,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.18.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Wed Mar 12 2025 Mamoru TASAKA - 1.18.4-1 - 1.18.4 From 6c2a1ceeed16171cdfbf7577127859a09fd22f62 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 31 Oct 2025 00:02:22 +0900 Subject: [PATCH 125/127] once bootstrap --- rubygem-cairo.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 7d3a04d..455ef2e 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -8,6 +8,9 @@ %if 0%{?fedora} >= 42 %bcond_with bootstrap %endif +%if 0%{?fedora} >= 44 +%bcond_without bootstrap +%endif # Upstream GIT http://github.com/rcairo/ @@ -16,7 +19,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: 1.18.4 -Release: 2%{?dist} +Release: 3%{?dist} # From gemspec # SPDX confirmed License: GPL-2.0-or-later OR Ruby @@ -189,6 +192,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Thu Oct 30 2025 Mamoru TASAKA - 1.18.4-3 +- Bump release + * Fri Jul 25 2025 Fedora Release Engineering - 1.18.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 61467552d53620d84fcfb9ba436491eda092e47f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 8 Jan 2026 14:39:52 +0900 Subject: [PATCH 126/127] Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0 --- rubygem-cairo.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 455ef2e..92d5739 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -19,7 +19,7 @@ Summary: Ruby bindings for cairo Name: rubygem-%{gem_name} Version: 1.18.4 -Release: 3%{?dist} +Release: 4%{?dist} # From gemspec # SPDX confirmed License: GPL-2.0-or-later OR Ruby @@ -192,6 +192,9 @@ ruby ./test/run-test.rb %{header_dir}/rb_cairo.h %changelog +* Thu Jan 08 2026 Mamoru TASAKA - 1.18.4-4 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0 + * Thu Oct 30 2025 Mamoru TASAKA - 1.18.4-3 - Bump release From cbf756724d7cd8955ead212b2f22a3e2b55a7e4e Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 8 Jan 2026 17:21:56 +0900 Subject: [PATCH 127/127] kill bootstrap --- rubygem-cairo.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec index 92d5739..7fb9f68 100644 --- a/rubygem-cairo.spec +++ b/rubygem-cairo.spec @@ -8,9 +8,6 @@ %if 0%{?fedora} >= 42 %bcond_with bootstrap %endif -%if 0%{?fedora} >= 44 -%bcond_without bootstrap -%endif # Upstream GIT http://github.com/rcairo/