[rubygem-atk] 1.1.2

Sun Jan 29 12:31:52 UTC 2012

commit 6d87b12d67b055738ba6ac6e574e286b5946e4a9
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Sun Jan 29 21:31:43 2012 +0900

    1.1.2

 .gitignore       |    1 +
 rubygem-atk.spec |  139 +++++++++++++++++++++++++++++++++---------------------
 sources          |    2 +-
 3 files changed, 87 insertions(+), 55 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 84284c4..fc18e96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /atk-1.0.0.gem
 /atk-1.0.3.gem
 /atk-1.1.1.gem
+/atk-1.1.2.gem
diff --git a/rubygem-atk.spec b/rubygem-atk.spec
index 6cda7d2..25fb3f3 100644
--- a/rubygem-atk.spec
+++ b/rubygem-atk.spec
@@ -1,34 +1,41 @@
+%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	atk
-%global	geminstdir	%{gemdir}/gems/%{gemname}-%{version}
+%global	rubyabi	1.8
+%global	header_dir	%{ruby_sitearch}
+%global	ruby19	0
+%endif
+
+%global	gem_name	atk
 
 %global	glibminver	1.1.0
 %global	obsoleteevr	0.90.7-1.999
 
-%global	rubyabi	1.8
-
 Summary:	Ruby binding of ATK-1.0.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/gems/%{gemname}-%{version}.gem
+Source0:	http://rubygems.org/gems/%{gem_name}-%{version}.gem
 
 BuildRequires:	ruby(abi) = %{rubyabi}
-BuildRequires:	rubygems
+BuildRequires:	rubygems-devel
 BuildRequires:	rubygem-glib2-devel >= %{glibminver}
 BuildRequires:	ruby-devel
 BuildRequires:	atk-devel
 Requires:	ruby(abi) = %{rubyabi}
 Requires:	rubygems
 Requires:	rubygem(glib2) >= %{glibminver}
-Provides:	rubygem(%{gemname}) = %{version}
+Provides:	rubygem(%{gem_name}) = %{version}
 
 %description
 Ruby/ATK is a Ruby binding of ATK-1.0.x or later.
@@ -41,16 +48,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(glib2) >= %{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/ATK development environment
@@ -60,25 +67,27 @@ Requires:	ruby-devel
 Requires:	rubygem-glib2-devel >= %{glibminver}
 Requires:	atk-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}
@@ -87,13 +96,15 @@ find . -name \*.gem | xargs chmod 0644
 
 %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|" \
@@ -101,15 +112,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
@@ -120,8 +138,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
@@ -129,7 +147,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
@@ -183,42 +201,55 @@ popd
 
 }
 
-create_symlink_rec %{geminstdir}/lib %{ruby_sitelib}
+%if ! %{ruby19}
+create_symlink_rec %{gem_instdir}/lib %{ruby_sitelib}
+%endif
 
 %check
 # Currently no testsuite is available
 
 %files
 %defattr(-,root,root,-)
-%dir	%{geminstdir}
-%dir	%{geminstdir}/lib/
+%dir	%{gem_instdir}
+%dir	%{gem_instdir}/lib/
 
-%doc	%{geminstdir}/[A-Z]*
-%exclude	%{geminstdir}/Rakefile
+%doc	%{gem_instdir}/[A-Z]*
+%exclude	%{gem_instdir}/Rakefile
 
-%{geminstdir}/lib/%{gemname}.rb
+%{gem_instdir}/lib/%{gem_name}.rb
+%if ! %{ruby19}
 # %%ruby_sitearch/ruby-gnome2 is owned by rubygem-glib2
-%{ruby_sitearch}/ruby-gnome2/%{gemname}.so
-
-%{gemdir}/cache/%{gemname}-%{version}.gem
-%{gemdir}/specifications/%{gemname}-%{version}.gemspec
-
-%files	-n ruby-%{gemname}
+%{ruby_sitearch}/ruby-gnome2/%{gem_name}.so
+%else
+%dir	%{gem_extdir}
+%dir	%{gem_extdir}/lib
+%{gem_extdir}/lib/%{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,-)
-%{ruby_sitearch}/rbatk.h
-%{ruby_sitearch}/rbatkversion.h
-%{_libdir}/pkgconfig/ruby-%{gemname}.pc
+%{header_dir}/rbatk.h
+%{header_dir}/rbatkversion.h
+%{_libdir}/pkgconfig/ruby-%{gem_name}.pc
 
 %files	doc
 %defattr(-,root,root,-)
-%{gemdir}/doc/%{gemname}-%{version}
-%{geminstdir}/Rakefile
+%{gem_docdir}/
+%{gem_instdir}/Rakefile
 
 %changelog
+* 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
 
@@ -245,7 +276,7 @@ create_symlink_rec %{geminstdir}/lib %{ruby_sitelib}
 
 * 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
@@ -260,7 +291,7 @@ create_symlink_rec %{geminstdir}/lib %{ruby_sitelib}
 - Use formally released gem file
 
 * Tue Sep 28 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.90.2-4
-- Fix up dependency for ruby-%%gemname
+- Fix up dependency for ruby-%%gem_name
 - Fix %%description
 
 * Tue Sep 28 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 0.90.2-2
diff --git a/sources b/sources
index 21e4682..4108ee6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cbafa59e82f5a5123f4c52c2e23d9703  atk-1.1.1.gem
+a291fdb347a685ddb7c55cc736e53b6d  atk-1.1.2.gem
