[rubygem-glib2/f16] 1.1.4
Mamoru Tasaka
mtasaka at fedoraproject.org
Mon Aug 13 09:35:46 UTC 2012
commit a329c5aa36e363fdf9178435b8d684c22b7f1128
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date: Mon Aug 13 18:35:42 2012 +0900
1.1.4
.gitignore | 1 +
rubygem-glib2.spec | 223 ++++++++++++++++++++++++++++++++++++----------------
sources | 2 +-
3 files changed, 157 insertions(+), 69 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7171f0b..fb2a2f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/glib2-0.90.9.gem
/glib2-1.0.0.gem
/glib2-1.0.3.gem
+/glib2-1.1.4.gem
diff --git a/rubygem-glib2.spec b/rubygem-glib2.spec
index 52e05e2..7104152 100644
--- a/rubygem-glib2.spec
+++ b/rubygem-glib2.spec
@@ -1,29 +1,42 @@
+%if %{?fedora:0%{fedora} >= 17}%{?rhel:0%{rhel} >= 7}
+%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 glib2
-%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
+%global rubyabi 1.8
+%global header_dir %{ruby_sitearch}
+%global ruby19 0
+%endif
-%global obsoleteevr 0.90.7-1.999
+%global gem_name glib2
-%global rubyabi 1.8
+%global obsoleteevr 0.90.7-1.999
Summary: Ruby binding of GLib-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
+# https://bugzilla.redhat.com/show_bug.cgi?id=804319
+# https://github.com/ruby-gnome2/ruby-gnome2/issues/106
+Patch0: rubygem-glib2-1.1.2-ifdef-enum.patch
+# https://github.com/ruby-gnome2/ruby-gnome2/issues/107
+Patch1: rubygem-glib2-1.1.2-utf-endian.patch
BuildRequires: ruby(abi) = %{rubyabi}
-BuildRequires: rubygems
+BuildRequires: rubygems-devel
BuildRequires: rubygem(pkg-config)
BuildRequires: ruby-devel
BuildRequires: glib2-devel
+# For patch
+BuildRequires: rubygem(rake-compiler)
## %%check
BuildRequires: rubygem(test-unit)
Requires: ruby(abi) = %{rubyabi}
@@ -33,7 +46,13 @@ Requires: rubygem(gettext)
# If someone uses gnome2-win32-binary-downloader.rb, please explicitly
# require the following by yourself
#Requires: rubygem(mechanize)
-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/GLib2 is a Ruby binding of GLib-2.x.
@@ -46,16 +65,16 @@ 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(gettext-package)
-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/GLib development environment
@@ -70,25 +89,27 @@ Requires: rubygem(rake-compiler)
# Not needed
#Requires: rubygem(cairo)
# Obsoletes / Provides
-# ruby(%%{gemname}-devel) Provides is for compatibility
-Obsoletes: ruby-%{gemname}-devel < %{obsoleteevr}
-Provides: ruby-%{gemname}-devel = %{version}-%{release}
-Provides: ruby(%{gemname}-devel) = %{version}-%{release}
+# 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
-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}
@@ -98,11 +119,11 @@ find . -name \*.gem | xargs chmod 0644
# Make pkg-config devel dependency (not runtime)
sed -i \
-e '\@pkg-config at s|add_\(runtime_\)*dependency|add_development_dependency|' \
- .%{gemdir}/specifications/%{gemname}-%{version}.gemspec \
- .%{geminstdir}/Rakefile
+ .%{gem_dir}/specifications/%{gem_name}-%{version}.gemspec \
+ .%{gem_instdir}/Rakefile
# Remove completely unneeded files
-pushd .%{geminstdir}
+pushd .%{gem_instdir}
# Remove vendorlized one (already packaged)
rm -rf test-unit/
@@ -120,13 +141,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
# create glib-test-init.rb
cat > lib/glib-test-init.rb <<EOF
@@ -141,15 +164,22 @@ EOF
%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
@@ -160,8 +190,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
@@ -169,7 +199,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
@@ -223,10 +253,12 @@ popd
}
-create_symlink_rec %{geminstdir}/lib %{ruby_sitelib}
+%if ! %{ruby19}
+create_symlink_rec %{gem_instdir}/lib %{ruby_sitelib}
+%endif
%check
-pushd .%{geminstdir}
+pushd .%{gem_instdir}
# Kill unneeded make process
mkdir -p TMPBINDIR
@@ -240,56 +272,111 @@ popd
%files
%defattr(-,root,root,-)
-%dir %{geminstdir}
-%dir %{geminstdir}/lib/
+%dir %{gem_instdir}
+%dir %{gem_instdir}/lib/
+
+%doc %{gem_instdir}/[A-Z]*
+%exclude %{gem_instdir}/Rakefile
+
+%{gem_instdir}/lib/glib2.rb
+%{gem_instdir}/lib/glib-mkenums.rb
+%{gem_instdir}/lib/gnome2-win32-binary-downloader.rb
+%dir %{gem_instdir}/lib/glib2
+%{gem_instdir}/lib/glib2/deprecatable.rb
+
+%if %{ruby19}
+%dir %{gem_extdir}
+%dir %{gem_extdir}/lib
+%{gem_extdir}/lib/%{gem_name}.so
+%else
%dir %{ruby_sitearch}/ruby-gnome2/
+%{ruby_sitearch}/ruby-gnome2/%{gem_name}.so
+%endif
-%doc %{geminstdir}/[A-Z]*
-%exclude %{geminstdir}/Rakefile
+%{gem_cache}
+%{gem_spec}
-%{geminstdir}/lib/glib2.rb
-%{geminstdir}/lib/glib-mkenums.rb
-%{geminstdir}/lib/gnome2-win32-binary-downloader.rb
-%{ruby_sitearch}/ruby-gnome2/%{gemname}.so
-
-%{gemdir}/cache/%{gemname}-%{version}.gem
-%{gemdir}/specifications/%{gemname}-%{version}.gemspec
-
-%files -n ruby-%{gemname}
+%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
+%endif
%files devel
%defattr(-,root,root,-)
# Using pkg-config and mkmf, let's move mkmf-gnome2.rb into -devel
# gnome2-raketask.rb uses rake-compiler, so also put this into -devel
# Also install gliglib-test-init.rb
-%{geminstdir}/lib/glib-test-init.rb
-%{geminstdir}/lib/gnome2-raketask.rb
-%{geminstdir}/lib/mkmf-gnome2.rb
+%{gem_instdir}/lib/glib-test-init.rb
+%{gem_instdir}/lib/gnome2-raketask.rb
+%{gem_instdir}/lib/mkmf-gnome2.rb
+%if ! %{ruby19}
%{ruby_sitelib}/glib-test-init.rb
%{ruby_sitelib}/gnome2-raketask.rb
%{ruby_sitelib}/mkmf-gnome2.rb
-
-%{ruby_sitearch}/rbgcompat.h
-%{ruby_sitearch}/rbglib.h
-%{ruby_sitearch}/rbgobject.h
-%{ruby_sitearch}/rbgutil.h
-%{ruby_sitearch}/glib-enum-types.h
-%{_libdir}/pkgconfig/ruby-%{gemname}.pc
+%endif
+
+%{header_dir}/rbgcompat.h
+%{header_dir}/rbglib.h
+%{header_dir}/rbglibdeprecated.h
+%{header_dir}/rbglib2conversions.h
+%{header_dir}/rbgobject.h
+%{header_dir}/rbgutil.h
+%{header_dir}/rbgutil_list.h
+%{header_dir}/rbgutildeprecated.h
+%{header_dir}/glib-enum-types.h
+%{_libdir}/pkgconfig/ruby-%{gem_name}.pc
%files doc
%defattr(-,root,root,-)
-%{gemdir}/doc/%{gemname}-%{version}
-%{geminstdir}/Rakefile
-%{geminstdir}/sample/
-%{geminstdir}/test/
+%{gem_docdir}/
+%{gem_instdir}/Rakefile
+%{gem_instdir}/sample/
+%{gem_instdir}/test/
%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
+
+* Mon Apr 16 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.1.3-1
+- 1.1.3
+
+* Tue Apr 03 2012 Bohuslav Kabrda <bkabrda at redhat.com> - 1.1.2-6
+- Fix conditionals for F17 to work for RHEL 7 as well.
+
+* Tue Mar 27 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.1.2-5
+- Fix UTF-{16,32} related test failure on ppc{,64}
+ (bug 804319, upstream bug 107)
+
+* Fri Mar 23 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.1.2-4
+- Fix build error with GLib >= 2.31.20 (bug 804319, upstream bug 106)
+
+* Wed Feb 1 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.1.2-3
+- Add proper Obsoletes/Provides
+
+* Sun Jan 29 2012 Mamoru Tasaka <mtasaka at fedoraproject.org>
+- And rebuild for ruby 1.9
+
+* Sun Jan 29 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.1.2-1
+- 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-3
+- F-17: Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Thu Dec 1 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.0.3-2
+- Workaround on build issue and test suite with GLib 2.31.2
+
* Mon Sep 19 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.0.3-1
- 1.0.3
@@ -316,7 +403,7 @@ popd
* Sun Oct 31 2010 Mamoru Taska <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.90.5-3
- 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 Taska <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.90.4-2
- 0.90.4
diff --git a/sources b/sources
index ad5add0..7c31a82 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7b22942bd581f596d0dbe69da22d74d7 glib2-1.0.3.gem
+18b478794f64b8b1d129199ed5b3b9df glib2-1.1.4.gem
More information about the scm-commits
mailing list