[rubygem-gio2] 2.0.2
Mamoru Tasaka
mtasaka at fedoraproject.org
Fri Aug 16 13:40:21 UTC 2013
commit 8b2a682d91acbc8f6a878d6cea34941cd8c71f19
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date: Fri Aug 16 22:40:11 2013 +0900
2.0.2
.gitignore | 1 +
rubygem-gio2.spec | 131 +++--------------------------------------------------
sources | 2 +-
3 files changed, 9 insertions(+), 125 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b12f32f..82d2233 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
/gio2-1.2.4.gem
/gio2-1.2.5.gem
/gio2-1.2.6.gem
+/gio2-2.0.2.gem
diff --git a/rubygem-gio2.spec b/rubygem-gio2.spec
index 608f83d..af57fbd 100644
--- a/rubygem-gio2.spec
+++ b/rubygem-gio2.spec
@@ -1,42 +1,22 @@
-%if 0%{?fedora} >= 17
-%if 0%{?fedora} < 19
-%global rubyabi 1.9.1
-%endif
%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 rubyabi 1.8
-%global header_dir %{ruby_sitearch}
-%global ruby19 0
-%endif
-
-%global glibminver 1.2.0
+%global glibminver 2.0.0
%global obsoleteevr 0.90.7-1.999
%global gem_name gio2
Summary: Ruby binding of gio-2.0.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: rubygems-devel
BuildRequires: rubygem-glib2-devel >= %{glibminver}
BuildRequires: ruby-devel
@@ -46,11 +26,10 @@ BuildRequires: rubygem(test-unit)
Requires: rubygems
Requires: rubygem(glib2) >= %{glibminver}
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/GIO2 is a Ruby binding of gio-2.0.x.
@@ -63,17 +42,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(glib2) >= %{glibminver}
-Provides: ruby(%{gem_name}) = %{version}-%{release}
-
-%description -n ruby-%{gem_name}
-This package provides non-Gem support for %{gem_name}.
-
%package devel
Summary: Ruby/GIO2 development environment
Group: Development/Languages
@@ -101,14 +69,6 @@ find . -name \*.gem | xargs chmod 0644
%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|" \
@@ -129,13 +89,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
@@ -151,69 +106,6 @@ 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
pushd .%{gem_instdir}
ruby -rubygems -Ilib test/load-test.rb
@@ -229,25 +121,13 @@ ruby -rubygems -Ilib test/load-test.rb
%{gem_instdir}/lib/%{gem_name}.rb
%{gem_instdir}/lib/%{gem_name}/deprecated.rb
-%if 0%{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
-%{ruby_sitelib}/gio2/
-%endif
-
%files devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/ruby-%{gem_name}.pc
@@ -261,6 +141,9 @@ ruby -rubygems -Ilib test/load-test.rb
%{gem_instdir}/test/
%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 16e462f..bcc0908 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0299702a76dd8f2cb183bb1718333407 gio2-1.2.6.gem
+31afc7d8950f6470a1e1b31f12e62eb8 gio2-2.0.2.gem
More information about the scm-commits
mailing list