diff --git a/.gitignore b/.gitignore index a6021da..71bbeb8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /gdk3-2.0.2.gem /gdk3-2.1.0.gem /gdk3-2.2.0.gem +/gdk3-2.2.3.gem diff --git a/rubygem-gdk3.spec b/rubygem-gdk3.spec index cdee7ac..e73f42f 100644 --- a/rubygem-gdk3.spec +++ b/rubygem-gdk3.spec @@ -1,12 +1,12 @@ %global header_dir %{ruby_vendorarchdir} %global gem_name gdk3 -%global glib_min_ver 2.1.0 +%global glib_min_ver 2.2.0 # Planned for F-20+ only Summary: Ruby binding of GDK-3.x Name: rubygem-%{gem_name} -Version: 2.2.0 -Release: 4%{?dist} +Version: 2.2.3 +Release: 1%{?dist} Group: Development/Languages # Various files in gem @@ -22,6 +22,8 @@ Requires: ruby BuildRequires: ruby Requires: ruby(rubygems) +# FIXME it seems this is needed +Requires: rubygem(atk) BuildRequires: ruby-devel BuildRequires: rubygems-devel BuildRequires: rubygem-glib2-devel >= %{glib_min_ver} @@ -29,9 +31,16 @@ BuildRequires: rubygem-pango-devel BuildRequires: gtk3-devel # %%check BuildRequires: rubygem(gdk_pixbuf2) +BuildRequires: rubygem(cairo-gobject) +BuildRequires: rubygem(gobject-introspection) BuildRequires: rubygem(test-unit) BuildRequires: rubygem(test-unit-notify) +# FIXME it seems this is needed +BuildRequires: rubygem(atk) +# X is needed +BuildRequires: xorg-x11-server-Xvfb Provides: rubygem(%{gem_name}) = %{version}-%{release} +Obsoletes: rubygem-gdk3-devel < 2.2.3 %description Ruby/GDK3 is a Ruby binding of GDK-3.x. @@ -72,7 +81,7 @@ find . -name \*.rb -print0 | xargs --null chmod 0644 gem specification -l --ruby %{SOURCE0} > %{gem_name}.gemspec # Allow ruby-gnome2 no less than ones -sed -i -e 's|= 2\.2\.0|>= 2.2.0|' %{gem_name}.gemspec +sed -i -e 's|= 2\.2\.3|>= 2.2.3|' %{gem_name}.gemspec # Add license text install -cpm 644 %{SOURCE1} ./COPYING.LIB @@ -98,6 +107,7 @@ cp -a .%{gem_dir}/* \ %{buildroot}%{gem_dir}/ # move header files, C extension files to the correct directory +%if 0 mkdir -p %{buildroot}%{gem_extdir_mri} cp -a ./%{gem_extdir_mri}/* %{buildroot}%{gem_extdir_mri}/ @@ -112,6 +122,7 @@ popd mkdir %{buildroot}%{_libdir}/pkgconfig install -cpm 644 ./%{_libdir}/pkgconfig/*.pc \ %{buildroot}%{_libdir}/pkgconfig/ +%endif # Cleanups pushd %{buildroot} @@ -130,7 +141,8 @@ ln -sf /bin/true make export PATH=$(pwd):$PATH popd -ruby -Ilib:test:ext/%{gem_name} ./test/run-test.rb +xvfb-run \ + ruby -Ilib:test:ext/%{gem_name} ./test/run-test.rb popd @@ -144,21 +156,28 @@ popd %dir %{gem_instdir}/lib/%{gem_name}/ %{gem_instdir}/lib/%{gem_name}/*.rb +%if 0 %{gem_extdir_mri}/ +%endif %exclude %{gem_cache} %{gem_spec} +%if 0 %files devel %{_libdir}/pkgconfig/ruby-%{gem_name}.pc %{header_dir}/rbgdk3.h %{header_dir}/rbgdk3conversions.h +%endif %files doc %doc %{gem_docdir}/ %exclude %{gem_instdir}/test/ %changelog +* Wed Nov 5 2014 Mamoru TASAKA - 2.2.3-1 +- 2.2.3 + * Mon Aug 18 2014 Fedora Release Engineering - 2.2.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 72e2b24..4a13604 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d3a5c8d9d4ae5fd5c759d08641254b60 gdk3-2.2.0.gem +5836d250e45d4e218c53361ddf787464 gdk3-2.2.3.gem