[rubygem-rsvg2] 2.0.2

Mamoru Tasaka mtasaka at fedoraproject.org
Fri Aug 16 13:42:36 UTC 2013


commit 35565078a0c2cd78b07e31ae5273066adb26e9bd
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date:   Fri Aug 16 22:42:26 2013 +0900

    2.0.2

 .gitignore         |    1 +
 rubygem-rsvg2.spec |  132 +++-------------------------------------------------
 sources            |    2 +-
 3 files changed, 9 insertions(+), 126 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b4e8858..eb8ba83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 /rsvg2-1.2.4.gem
 /rsvg2-1.2.5.gem
 /rsvg2-1.2.6.gem
+/rsvg2-2.0.2.gem
diff --git a/rubygem-rsvg2.spec b/rubygem-rsvg2.spec
index 4a7733b..4ab5478 100644
--- a/rubygem-rsvg2.spec
+++ b/rubygem-rsvg2.spec
@@ -1,33 +1,22 @@
-%if 0%{?fedora} < 19
-%global	rubyabi	1.9.1
-%endif
 %global	header_dir	%{ruby_vendorarchdir}
-%global	ruby19	1
 
 %global	gem_name	rsvg2
 
-%global	glibminver	1.2.0
+%global	glibminver	2.0.0
 %global	obsoleteevr	0.90.7-1.999
 
 Summary:	Ruby binding of librsvg-2.x
 Name:		rubygem-%{gem_name}
-Version:	1.2.6
-Release:	2%{?dist}
+Version:	2.0.2
+Release:	1%{?dist}
 Group:		Development/Languages
 # from README
 License:	LGPLv2
 URL:		http://ruby-gnome2.sourceforge.jp/
 Source0:	http://rubygems.org/gems/%{gem_name}-%{version}.gem
 
-%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:	rubygem-cairo-devel
 BuildRequires:	rubygem-glib2-devel >= %{glibminver}
@@ -37,12 +26,9 @@ BuildRequires:	librsvg2-devel
 Requires:	rubygem(cairo)
 Requires:	rubygem(gdk_pixbuf2) >= %{glibminver}
 Requires:	rubygem(glib2) >= %{glibminver}
-Provides:	rubygem(%{gem_name}) = %{version}
-%if %{ruby19}
-Obsoletes:	ruby-%{gem_name} = %{version}-%{release}
+Provides:	rubygem(%{gem_name}) = %{version}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.
@@ -55,21 +41,6 @@ Requires:	%{name} = %{version}-%{release}
 %description	doc
 This package contains documentation for %{name}.
 
-%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(%{gem_name}) = %{version}-%{release}
-# And for compatibility
-Provides:	ruby(rsvg) = %{version}-%{release}
-
-%description	-n ruby-%{gem_name}
-This package provides non-Gem support for %{gem_name}.
-
 %package	devel
 Summary:	Ruby/RSVG development environment
 Group:		Development/Languages
@@ -107,18 +78,6 @@ popd
 %build
 # Move C extension library to some private directory
 pushd .%{gem_instdir}
-%if ! %{ruby19}
-mkdir lib/ruby-gnome2
-mv lib/%{gem_name}.so lib/ruby-gnome2/
-grep -rl '%{gem_name}.so' . | \
-	xargs sed -i \
-		-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|" \
-	Rakefile
 
 %install
 # Once copy all
@@ -131,13 +90,8 @@ pushd %{buildroot}
 #mkdir -p .%{header_dir}
 #mv .%{gem_instdir}/lib/*.h .%{header_dir}/
 
-%if ! %{ruby19}
-mkdir -p .%{ruby_sitearch}/ruby-gnome2
-mv .%{gem_instdir}/lib/ruby-gnome2/%{gem_name}.so .%{ruby_sitearch}/ruby-gnome2/
-%else
 mkdir -p .%{gem_extdir_mri}/lib
 mv .%{gem_instdir}/lib/%{gem_name}.so .%{gem_extdir_mri}/lib
-%endif
 
 popd
 
@@ -146,76 +100,12 @@ mkdir %{buildroot}%{_libdir}/pkgconfig
 install -cpm 644 ./%{_libdir}/pkgconfig/*.pc \
 	%{buildroot}%{_libdir}/pkgconfig/
 
-
 # Cleanups
 pushd %{buildroot}
 rm -rf .%{gem_instdir}/ext/
 rm -f .%{gem_instdir}/extconf.rb
 popd
 
-# 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}
-create_symlink_rec %{gem_instdir}/lib %{ruby_sitelib}
-%endif
-
 %check
 # No test suite available
 
@@ -228,24 +118,13 @@ create_symlink_rec %{gem_instdir}/lib %{ruby_sitelib}
 %exclude	%{gem_instdir}/Rakefile
 
 %{gem_instdir}/lib/%{gem_name}.rb
-%if %{ruby19}
 %dir	%{gem_extdir_mri}
 %dir	%{gem_extdir_mri}/lib
 %{gem_extdir_mri}/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-%{gem_name}.pc
@@ -257,6 +136,9 @@ create_symlink_rec %{gem_instdir}/lib %{ruby_sitelib}
 %{gem_instdir}/sample/
 
 %changelog
+* Fri Aug 16 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 2.0.2-1
+- 2.0.2
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index e71683a..5b6e1ab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b23128b0aedf4b845fbecdb49482e22e  rsvg2-1.2.6.gem
+feb5dfec7fbe5bf03f6318377e43c892  rsvg2-2.0.2.gem


More information about the scm-commits mailing list