[rubygem-gtk2] 1.1.2

Tue Jan 31 05:23:35 UTC 2012

commit d71d981286a07a84b6a2397a628872bb96f52636
Author: TASAKA Mamoru <mtasaka at localhost.localdomain>
Date:   Tue Jan 31 14:23:31 2012 +0900

    1.1.2

 .gitignore        |    1 +
 rubygem-gtk2.spec |  156 +++++++++++++++++++++++++++++++---------------------
 sources           |    2 +-
 3 files changed, 95 insertions(+), 64 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index f06a495..1c392a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /gtk2-1.0.0.gem
 /gtk2-1.0.3.gem
 /gtk2-1.1.1.gem
+/gtk2-1.1.2.gem
diff --git a/rubygem-gtk2.spec b/rubygem-gtk2.spec
index 38d6633..48c965c 100644
--- a/rubygem-gtk2.spec
+++ b/rubygem-gtk2.spec
@@ -1,27 +1,33 @@
+%if 0%{?fedora} >= 18
+%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	gtk2
-%global	geminstdir	%{gemdir}/gems/%{gemname}-%{version}
+%global	rubyabi	1.8
+%global	header_dir	%{ruby_sitearch}
+%global	ruby19	0
+%endif
+
+%global	gem_name	gtk2
 
 %global	glibminver	1.1.0
 %global	obsoleteevr	0.90.7-1.999
 
-%global	rubyabi	1.8
-
 Summary:	Ruby binding of GTK+-2.x
-Name:		rubygem-%{gemname}
-Version:	1.1.1
+Name:		rubygem-%{gem_name}
+Version:	1.1.2
 Release:	1%{?dist}
 Group:		Development/Languages
 # from README
 License:	LGPLv2
 URL:		http://ruby-gnome2.sourceforge.jp/
-Source0:	http://rubygems.org/downloads/%{gemname}-%{version}.gem
+Source0:	http://rubygems.org/downloads/%{gem_name}-%{version}.gem
 
 BuildRequires:	ruby(abi) = %{rubyabi}
-BuildRequires:	rubygems
+BuildRequires:	rubygems-devel
 BuildRequires:	rubygem-cairo-devel
 BuildRequires:	rubygem-glib2-devel >= %{glibminver}
 BuildRequires:	rubygem-pango-devel >= %{glibminver}
@@ -33,7 +39,7 @@ Requires:	rubygem(atk) >= %{glibminver}
 Requires:	rubygem(gdk_pixbuf2) >= %{glibminver}
 Requires:	rubygem(glib2) >= %{glibminver}
 Requires:	rubygem(pango) >= %{glibminver}
-Provides:	rubygem(%{gemname}) = %{version}
+Provides:	rubygem(%{gem_name}) = %{version}
 
 %description
 Ruby/GTK2 is a Ruby binding of GTK+-2.0.x.
@@ -46,8 +52,8 @@ 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
@@ -55,10 +61,10 @@ Requires:	ruby(atk) >= %{glibminver}
 Requires:	ruby(gdk_pixbuf2) >= %{glibminver}
 Requires:	ruby(glib2) >= %{glibminver}
 Requires:	ruby(pango) >= %{glibminver}
-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/GTK development environment
@@ -68,32 +74,34 @@ Requires:	ruby-devel
 Requires:	gtk2-devel
 Requires:	rubygem-glib2-devel
 # 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}
 
 find . -name \*.gem | xargs chmod 0644
 
-pushd .%{geminstdir}
+pushd .%{gem_instdir}
 # Fix wrong dir
 grep -rl /usr/local/bin sample | \
 	xargs sed -i -e 's|/usr/local/|/usr/|'
@@ -106,13 +114,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|" \
@@ -120,15 +130,22 @@ 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
@@ -139,8 +156,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
@@ -148,7 +165,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
@@ -202,14 +219,16 @@ popd
 
 }
 
-create_symlink_rec %{geminstdir}/lib %{ruby_sitelib}
+%if ! %{ruby19}
+create_symlink_rec %{gem_instdir}/lib %{ruby_sitelib}
+%endif
 
 %check
 # X is needed, disabling.
 # Currently it seems that all test succeeds under X
 exit 0
 
-pushd .%{geminstdir}
+pushd .%{gem_instdir}
 
 # kill unneeded make process
 rm -rf ./TMPBINDIR
@@ -223,43 +242,54 @@ ruby -Itest ./test/run-test.rb
 
 %files
 %defattr(-,root,root,-)
-%dir	%{geminstdir}
-%dir	%{geminstdir}/lib/
-%dir	%{geminstdir}/lib/%{gemname}/
-
-%doc	%{geminstdir}/[A-Z]*
-%exclude	%{geminstdir}/Rakefile
-
-%{geminstdir}/lib/%{gemname}.rb
-%{geminstdir}/lib/%{gemname}/base.rb
+%dir	%{gem_instdir}
+%dir	%{gem_instdir}/lib/
+%dir	%{gem_instdir}/lib/%{gem_name}/
+
+%doc	%{gem_instdir}/[A-Z]*
+%exclude	%{gem_instdir}/Rakefile
+
+%{gem_instdir}/lib/%{gem_name}.rb
+%{gem_instdir}/lib/%{gem_name}/base.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/%{gemname}.so
+%{ruby_sitearch}/ruby-gnome2/%{gem_name}.so
+%endif
 
-%{gemdir}/cache/%{gemname}-%{version}.gem
-%{gemdir}/specifications/%{gemname}-%{version}.gemspec
+%{gem_cache}
+%{gem_spec}
 
-%files	-n ruby-%{gemname}
+%if ! %{ruby19}
+%files	-n ruby-%{gem_name}
 %defattr(-,root,root,-)
 %{ruby_sitelib}/*.rb
-%{ruby_sitelib}/%{gemname}/
+%{ruby_sitelib}/%{gem_name}/
+%endif
 
 %files	devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/ruby-%{gemname}.pc
-%{ruby_sitearch}/rbgdk.h
-%{ruby_sitearch}/rbgdkconversions.h
-%{ruby_sitearch}/rbgtk.h
-%{ruby_sitearch}/rbgtkconversions.h
-%{ruby_sitearch}/rbgtkmacros.h
+%{_libdir}/pkgconfig/ruby-%{gem_name}.pc
+%{header_dir}/rbgdk.h
+%{header_dir}/rbgdkconversions.h
+%{header_dir}/rbgtk.h
+%{header_dir}/rbgtkconversions.h
+%{header_dir}/rbgtkmacros.h
 
 %files	doc
 %defattr(-,root,root,-)
-%{gemdir}/doc/%{gemname}-%{version}
-%{geminstdir}/Rakefile
-%{geminstdir}/sample/
-%{geminstdir}/test/
+%{gem_dir}/doc/%{gem_name}-%{version}
+%{gem_instdir}/Rakefile
+%{gem_instdir}/sample/
+%{gem_instdir}/test/
 
 %changelog
+* Tue Jan 31 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
 
@@ -290,7 +320,7 @@ ruby -Itest ./test/run-test.rb
 
 * Sun Oct 31 2010 Mamoru Taska  <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 Taska  <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.90.4-2
 - 0.90.4
diff --git a/sources b/sources
index f5b747a..8c81f3c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-17e3cd3eb0358538ec6fd7b29afa6fe7  gtk2-1.1.1.gem
+d07fec116a96b661f2b7dbf086d770d6  gtk2-1.1.2.gem
