[rubygem-glib2] 2.0.2
Mamoru Tasaka
mtasaka at fedoraproject.org
Fri Aug 16 13:40:38 UTC 2013
commit 5375334cec3d04c9e31d56cb3a43f3342367bf59
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date: Fri Aug 16 22:40:28 2013 +0900
2.0.2
.gitignore | 1 +
rubygem-glib2.spec | 159 +++-------------------------------------------------
sources | 2 +-
3 files changed, 10 insertions(+), 152 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 821494b..d58075a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@
/glib2-1.2.4.gem
/glib2-1.2.5.gem
/glib2-1.2.6.gem
+/glib2-2.0.2.gem
diff --git a/rubygem-glib2.spec b/rubygem-glib2.spec
index 000c1a5..211b6c9 100644
--- a/rubygem-glib2.spec
+++ b/rubygem-glib2.spec
@@ -1,18 +1,4 @@
-%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 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 gem_name glib2
@@ -20,30 +6,21 @@
Summary: Ruby binding of GLib-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
-# GLib::Completion removed on 1.2.6
-Patch0: rubygem-glib2-1.2.6-GLibCompletion-delete.patch
# F-19 %%_bindir/ruby wrapper pollutes environ, which makes
# g_spawn_async() test failure
Patch100: rubygem-glib2-1.2.1-rubywrapper-pollutes-env.patch
-%if 0%{?fedora} >= 19
Requires: ruby(release)
# Explicitly require mri for g_spawn_async() test
BuildRequires: %{_bindir}/ruby-mri
BuildRequires: ruby(release)
-%else
-Requires: ruby(abi) = %{rubyabi}
-Requires: ruby
-BuildRequires: ruby(abi) = %{rubyabi}
-BuildRequires: ruby
-%endif
BuildRequires: rubygems-devel
BuildRequires: rubygem(pkg-config)
BuildRequires: ruby-devel
@@ -61,11 +38,9 @@ Requires: rubygems
#Requires: rubygem(mechanize)
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/GLib2 is a Ruby binding of GLib-2.x.
@@ -78,17 +53,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(gettext-package)
-Provides: ruby(%{gem_name}) = %{version}-%{release}
-
-%description -n ruby-%{gem_name}
-This package provides non-Gem support for %{gem_name}.
-
%package devel
Summary: Ruby/GLib development environment
Group: Development/Languages
@@ -105,9 +69,6 @@ Requires: rubygem(rake-compiler)
# ruby(%%{gem_name}-devel) Provides is for compatibility
Obsoletes: ruby-%{gem_name}-devel < %{obsoleteevr}
Provides: ruby-%{gem_name}-devel = %{version}-%{release}
-%if ! %{ruby19}
-Provides: ruby(%{gem_name}-devel) = %{version}-%{release}
-%endif
%description devel
Header files and libraries for building a extension library for the
@@ -126,17 +87,6 @@ cd %{gem_name}-%{version}
gem specification -l --ruby %{SOURCE0} > %{gem_name}.gemspec
# Patches and etc
-%if 0%{?fedora} < 19
-# Revert
-%patch0 -p2 -R
-grep -rl completion . | while read f
-do
- ff=${f#./}
- sed -i \
- -e "\@s\.files at s|\"README\",|\"README\", \"$ff\",|" \
- %{gem_name}.gemspec
-done
-%endif
%patch100 -p1
# Make pkg-config devel dependency (not runtime)
@@ -168,14 +118,6 @@ export CONFIGURE_ARGS="$CONFIGURE_ARGS --with-pkg-config-dir=$(pwd)%{_libdir}/pk
# 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
# create glib-test-init.rb
cat > lib/glib-test-init.rb <<EOF
@@ -199,13 +141,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
# move pkgconfig file
@@ -220,69 +157,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}
@@ -309,29 +183,13 @@ popd
%dir %{gem_instdir}/lib/glib2
%{gem_instdir}/lib/glib2/deprecatable.rb
-%if %{ruby19}
%dir %{gem_extdir_mri}
%dir %{gem_extdir_mri}/lib
%{gem_extdir_mri}/lib/%{gem_name}.so
-%else
-%dir %{ruby_sitearch}/ruby-gnome2/
-%{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}/glib2/
-%exclude %{ruby_sitelib}/glib-test-init.rb
-%exclude %{ruby_sitelib}/gnome2-raketask.rb
-%exclude %{ruby_sitelib}/mkmf-gnome2.rb
-%exclude %{ruby_sitelib}/gnome2-win32-binary-*.rb
-%endif
-
%files devel
%defattr(-,root,root,-)
# Using pkg-config and mkmf, let's move mkmf-gnome2.rb into -devel
@@ -340,13 +198,9 @@ popd
%{gem_instdir}/lib/glib-test-init.rb
%{gem_instdir}/lib/gnome2-raketask.rb
%{gem_instdir}/lib/mkmf-gnome2.rb
-%{gem_instdir}/lib/gnome2-win32-binary-*.rb
-%if ! %{ruby19}
-%{ruby_sitelib}/glib-test-init.rb
-%{ruby_sitelib}/gnome2-raketask.rb
-%{ruby_sitelib}/mkmf-gnome2.rb
-%{ruby_sitelib}/gnome2-win32-binary-*.rb
-%endif
+%dir %{gem_instdir}/lib/gnome2/
+%dir %{gem_instdir}/lib/gnome2/rake/
+%{gem_instdir}/lib/gnome2/rake/*.rb
%{header_dir}/rbgcompat.h
%{header_dir}/rbglib.h
@@ -368,6 +222,9 @@ popd
%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 e4cdc36..e9b04e5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-940765ce7edcb992d28cd2dbd1c63a0f glib2-1.2.6.gem
+0e1efd19020700ffeed8f4fc449e6a27 glib2-2.0.2.gem
More information about the scm-commits
mailing list