[rubygem-rsvg2/f16] 1.1.4
Mamoru Tasaka
mtasaka at fedoraproject.org
Mon Aug 13 09:39:34 UTC 2012
commit b396a4e7a032682767ba2e0c1c7b42780c8bbfba
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date: Mon Aug 13 18:39:31 2012 +0900
1.1.4
.gitignore | 1 +
rubygem-rsvg2.spec | 155 ++++++++++++++++++++++++++++++++++-----------------
sources | 2 +-
3 files changed, 105 insertions(+), 53 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fd00f66..124bd48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/rsvg2-0.90.9.gem
/rsvg2-1.0.0.gem
/rsvg2-1.0.3.gem
+/rsvg2-1.1.4.gem
diff --git a/rubygem-rsvg2.spec b/rubygem-rsvg2.spec
index a1611c1..9c701ef 100644
--- a/rubygem-rsvg2.spec
+++ b/rubygem-rsvg2.spec
@@ -1,35 +1,47 @@
+%if 0%{?fedora} >= 17
+%global rubyabi 1.9.1
+%global header_dir %{ruby_vendorarchdir}
+%global ruby19 1
+%else
%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
%global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
-%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%global gemname rsvg2
-%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
+%global rubyabi 1.8
+%global header_dir %{ruby_sitearch}
+%global ruby19 0
+%endif
-%global glibminver 1.0.3
-%global obsoleteevr 0.90.7-1.999
+%global gem_name rsvg2
-%global rubyabi 1.8
+%global glibminver 1.1.4
+%global obsoleteevr 0.90.7-1.999
Summary: Ruby binding of librsvg-2.x
-Name: rubygem-%{gemname}
-Version: 1.0.3
+Name: rubygem-%{gem_name}
+Version: 1.1.4
Release: 1%{?dist}
Group: Development/Languages
# from README
License: LGPLv2
URL: http://ruby-gnome2.sourceforge.jp/
-Source0: http://rubygems.org/gems/%{gemname}-%{version}.gem
+Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
BuildRequires: ruby(abi) = %{rubyabi}
BuildRequires: rubygem-cairo-devel
BuildRequires: rubygem-glib2-devel >= %{glibminver}
BuildRequires: ruby-devel
+BuildRequires: rubygems-devel
BuildRequires: librsvg2-devel
Requires: ruby(abi) = %{rubyabi}
Requires: rubygem(cairo)
Requires: rubygem(gdk_pixbuf2) >= %{glibminver}
Requires: rubygem(glib2) >= %{glibminver}
-Provides: rubygem(%{gemname}) = %{version}
+Provides: rubygem(%{gem_name}) = %{version}
+%if %{ruby19}
+Obsoletes: ruby-%{gem_name} = %{version}-%{release}
+Provides: ruby-%{gem_name} = %{version}-%{release}
+Provides: ruby(%{gem_name}) = %{version}-%{release}
+%endif
%description
Ruby/RSVG is a Ruby binding of librsvg.
@@ -42,20 +54,20 @@ Requires: %{name} = %{version}-%{release}
%description doc
This package contains documentation for %{name}.
-%package -n ruby-%{gemname}
-Summary: Non-Gem support package for %{gemname}
+%package -n ruby-%{gem_name}
+Summary: Non-Gem support package for %{gem_name}
Group: Development/Languages
Requires: %{name} = %{version}-%{release}
# Requires for corresponsing non-gem rpms
Requires: ruby(cairo)
Requires: ruby(gdk_pixbuf2) >= %{glibminver}
Requires: ruby(glib2) >= %{glibminver}
-Provides: ruby(%{gemname}) = %{version}-%{release}
+Provides: ruby(%{gem_name}) = %{version}-%{release}
# And for compatibility
Provides: ruby(rsvg) = %{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/RSVG development environment
@@ -65,32 +77,32 @@ Requires: ruby-devel
Requires: pango-devel
Requires: rubygem-cairo-devel
# Obsoletes / Provides
-# ruby(%%{gemname}-devel) Provides is for compatibility
+# ruby(%%{gem_name}-devel) Provides is for compatibility
Obsoletes: ruby-rsvg-devel < %{obsoleteevr}
Provides: ruby-rsvg-devel = %{version}-%{release}
Provides: ruby(rsvg-devel) = %{version}-%{release}
%description devel
Header files and libraries for building a extension library for the
-rubygem-%{gemname}
+rubygem-%{gem_name}
%prep
%setup -q -c -T
-mkdir -p .%{gemdir}
+mkdir -p .%{gem_dir}
export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
export CONFIGURE_ARGS="$CONFIGURE_ARGS --with-pkg-config-dir=$(pwd)%{_libdir}/pkgconfig"
gem install \
-V \
--local \
- --install-dir .%{gemdir} \
+ --install-dir .%{gem_dir} \
--force \
--rdoc \
%{SOURCE0}
find . -name \*.gem | xargs chmod 0644
-pushd .%{geminstdir}
+pushd .%{gem_instdir}
# Kill shebang
grep -rl '#!.*/usr/bin' sample | \
xargs sed -i -e '\@#![ ]*/usr/bin at d'
@@ -99,13 +111,15 @@ popd
%build
# Move C extension library to some private directory
-pushd .%{geminstdir}
+pushd .%{gem_instdir}
+%if ! %{ruby19}
mkdir lib/ruby-gnome2
-mv lib/%{gemname}.so lib/ruby-gnome2/
-grep -rl '%{gemname}.so' . | \
+mv lib/%{gem_name}.so lib/ruby-gnome2/
+grep -rl '%{gem_name}.so' . | \
xargs sed -i \
- -e "\@require at s|'%{gemname}.so'|'ruby-gnome2/%{gemname}.so'|" \
- -e '\@require at s|"%{gemname}.so"|"ruby-gnome2/%{gemname}.so"|'
+ -e "\@require at s|'%{gem_name}.so'|'ruby-gnome2/%{gem_name}.so'|" \
+ -e '\@require at s|"%{gem_name}.so"|"ruby-gnome2/%{gem_name}.so"|'
+%endif
# Fix up Rakefile for "gnome2-raketask" requirement
sed -i -e "/require.*gnome2-raketask/s|^\(.*\)|begin\n \1\nrescue LoadError\n require 'rubygems'\n require 'gnome2-raketask'\nend\n|" \
@@ -113,15 +127,23 @@ sed -i -e "/require.*gnome2-raketask/s|^\(.*\)|begin\n \1\nrescue LoadError\n
%install
# Once copy all
-mkdir -p %{buildroot}%{gemdir}
-cp -a .%{gemdir}/* \
- %{buildroot}%{gemdir}/
+mkdir -p %{buildroot}%{gem_dir}
+cp -a .%{gem_dir}/* \
+ %{buildroot}%{gem_dir}/
pushd %{buildroot}
# move header files, C extension files to the correct directory
+#mkdir -p .%{header_dir}
+#mv .%{gem_instdir}/lib/*.h .%{header_dir}/
+
+%if ! %{ruby19}
mkdir -p .%{ruby_sitearch}/ruby-gnome2
-# mv .%%{geminstdir}/lib/*.h .%%{ruby_sitearch}/
-mv .%{geminstdir}/lib/ruby-gnome2/%{gemname}.so .%{ruby_sitearch}/ruby-gnome2/
+mv .%{gem_instdir}/lib/ruby-gnome2/%{gem_name}.so .%{ruby_sitearch}/ruby-gnome2/
+%else
+mkdir -p .%{gem_extdir}/lib
+mv .%{gem_instdir}/lib/%{gem_name}.so .%{gem_extdir}/lib
+%endif
+
popd
# move pkgconfig file
@@ -132,8 +154,8 @@ install -cpm 644 ./%{_libdir}/pkgconfig/*.pc \
# Cleanups
pushd %{buildroot}
-rm -rf .%{geminstdir}/ext/
-rm -f .%{geminstdir}/extconf.rb
+rm -rf .%{gem_instdir}/ext/
+rm -f .%{gem_instdir}/extconf.rb
popd
# The following method is completely copied from rubygem-gettext
@@ -141,7 +163,7 @@ popd
#
# 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
@@ -195,40 +217,69 @@ popd
}
-create_symlink_rec %{geminstdir}/lib %{ruby_sitelib}
+%if ! %{ruby19}
+create_symlink_rec %{gem_instdir}/lib %{ruby_sitelib}
+%endif
%check
# No test suite available
%files
%defattr(-,root,root,-)
-%dir %{geminstdir}
-%dir %{geminstdir}/lib/
-
-%doc %{geminstdir}/[A-Z]*
-%exclude %{geminstdir}/Rakefile
-
-%{geminstdir}/lib/%{gemname}.rb
-%{ruby_sitearch}/ruby-gnome2/%{gemname}.so
-
-%{gemdir}/cache/%{gemname}-%{version}.gem
-%{gemdir}/specifications/%{gemname}-%{version}.gemspec
-
-%files -n ruby-%{gemname}
+%dir %{gem_instdir}
+%dir %{gem_instdir}/lib/
+
+%doc %{gem_instdir}/[A-Z]*
+%exclude %{gem_instdir}/Rakefile
+
+%{gem_instdir}/lib/%{gem_name}.rb
+%if %{ruby19}
+%dir %{gem_extdir}
+%dir %{gem_extdir}/lib
+%{gem_extdir}/lib/%{gem_name}.so
+%else
+# %%ruby_sitearch/ruby-gnome2 is owned by rubygem-glib2
+%{ruby_sitearch}/ruby-gnome2/%{gem_name}.so
+%endif
+
+%{gem_cache}
+%{gem_spec}
+
+%if ! %{ruby19}
+%files -n ruby-%{gem_name}
%defattr(-,root,root,-)
%{ruby_sitelib}/*.rb
+%endif
%files devel
%defattr(-,root,root,-)
-%{_libdir}/pkgconfig/ruby-%{gemname}.pc
+%{_libdir}/pkgconfig/ruby-%{gem_name}.pc
%files doc
%defattr(-,root,root,-)
-%{gemdir}/doc/%{gemname}-%{version}
-%{geminstdir}/Rakefile
-%{geminstdir}/sample/
+%{gem_docdir}/
+%{gem_instdir}/Rakefile
+%{gem_instdir}/sample/
%changelog
+* Mon Aug 13 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.1.4-1
+- 1.1.4
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Tue Apr 17 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.1.3-1
+- 1.1.3
+
+* Thu Feb 2 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.1.2-2
+- 1.1.2
+
+* Sun Jan 15 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.1.1-1
+- 1.1.1
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-2
+- F-17: Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
* Mon Sep 19 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.0.3-1
- 1.0.3
@@ -252,7 +303,7 @@ create_symlink_rec %{geminstdir}/lib %{ruby_sitelib}
* Sun Oct 31 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.90.5-2
- 0.90.5
-- Move C extension so that "require %%gemname" works correctly
+- Move C extension so that "require %%gem_name" works correctly
* Sun Oct 24 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.90.4-2
- 0.90.4
diff --git a/sources b/sources
index b745c10..abb935f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-121da589fd4b807b03851127be5ff0bd rsvg2-1.0.3.gem
+7084bcba75d11e7e3f785f295188dee7 rsvg2-1.1.4.gem
More information about the scm-commits
mailing list