[rubygem-gtk3] F-21: rebuild for ruby 2.1 / rubygems 2.2

Mamoru TASAKA mtasaka at fedoraproject.org
Fri Apr 18 06:17:55 UTC 2014


commit 0c7014e3bf670dd5ce63fe9d0aa025a5eeb22cdf
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date:   Fri Apr 18 15:17:42 2014 +0900

    F-21: rebuild for ruby 2.1 / rubygems 2.2

 rubygem-gtk3.spec |   29 +++++++++++++----------------
 1 files changed, 13 insertions(+), 16 deletions(-)
---
diff --git a/rubygem-gtk3.spec b/rubygem-gtk3.spec
index 2f09165..2a1cc58 100644
--- a/rubygem-gtk3.spec
+++ b/rubygem-gtk3.spec
@@ -6,7 +6,7 @@
 Summary:	Ruby/GTK3 is a Ruby binding of GTK+-3.x
 Name:		rubygem-%{gem_name}
 Version:	2.2.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Group:		Development/Languages
 # Various files in gem
@@ -21,12 +21,6 @@ Requires:	ruby
 BuildRequires:	ruby
 
 Requires:	ruby(rubygems)
-Requires:	rubygem(atk)
-Requires:	rubygem(gdk_pixbuf2)
-Requires:	rubygem(gdk3)
-Requires:	rubygem(gio2) >= %{glib_min_ver}
-Requires:	rubygem(glib2) >= %{glib_min_ver}
-Requires:	rubygem(pango)
 BuildRequires:	ruby-devel
 BuildRequires:	rubygems-devel
 BuildRequires:	rubygem-cairo-devel
@@ -37,6 +31,7 @@ BuildRequires:	rubygem-glib2-devel >= %{glib_min_ver}
 BuildRequires:	rubygem-pango-devel
 BuildRequires:	gtk3-devel
 # %%check
+BuildRequires:	rubygem(atk)
 BuildRequires:	rubygem(test-unit)
 BuildRequires:	rubygem(test-unit-notify)
 # Needs X
@@ -118,15 +113,16 @@ cp -a .%{gem_dir}/* \
 	%{buildroot}%{gem_dir}/
 
 # move header files, C extension files to the correct directory
-pushd %{buildroot}
+mkdir -p %{buildroot}%{gem_extdir_mri}
+cp -a ./%{gem_extdir_mri}/* %{buildroot}%{gem_extdir_mri}/
 
+pushd %{buildroot}
 mkdir -p .%{header_dir}
-mv .%{gem_instdir}/lib/*.h .%{header_dir}/
-
-mkdir -p .%{gem_extdir_mri}/lib
-mv .%{gem_instdir}/lib/%{gem_name}.so .%{gem_extdir_mri}/lib/
+mv .%{gem_extdir_mri}/*.h .%{header_dir}/
+rm -f .%{gem_extdir_mri}/{gem_make.out,mkmf.log}
 popd
 
+
 # move pkgconfig file
 mkdir %{buildroot}%{_libdir}/pkgconfig
 install -cpm 644 ./%{_libdir}/pkgconfig/*.pc \
@@ -142,7 +138,7 @@ popd
 pushd .%{gem_instdir}
 cd test
 xvfb-run \
-	ruby -I../lib:. run-test.rb
+	ruby -I../lib:.:../ext/%{gem_name} run-test.rb
 cd ..
 popd
 
@@ -155,9 +151,7 @@ popd
 %dir	%{gem_instdir}/lib/%{gem_name}/
 %{gem_instdir}/lib/%{gem_name}/*.rb
 
-%dir	%{gem_extdir_mri}/
-%dir	%{gem_extdir_mri}/lib/
-%{gem_extdir_mri}/lib/%{gem_name}.so
+%{gem_extdir_mri}/
 
 %exclude %{gem_cache}
 %{gem_spec}
@@ -173,6 +167,9 @@ popd
 %exclude	%{gem_instdir}/test/
 
 %changelog
+* Fri Apr 18 2014 Mamoru TASAKA <mtasaka at fedoraproject.org> - 2.2.0-2
+- F-21: rebuild for ruby 2.1 / rubygems 2.2
+
 * Mon Apr 14 2014 Mamoru TASAKA <mtasaka at fedoraproject.org> - 2.2.0-1
 - 2.2.0
 


More information about the scm-commits mailing list