[rubygem-gtk2/f16] Revert "1.1.4"
Mamoru Tasaka
mtasaka at fedoraproject.org
Mon Aug 13 13:53:54 UTC 2012
commit 4d0a34802e79fe2cb391e17e92e159db6369dad8
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date: Mon Aug 13 22:53:47 2012 +0900
Revert "1.1.4"
This reverts commit 75bb1adb8162be73433a91350e2afce32c1e6471.
.gitignore | 1 -
rubygem-gtk2.spec | 191 +++++++++++++++++++----------------------------------
sources | 2 +-
3 files changed, 68 insertions(+), 126 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c9a2cc0..7b4cdaf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,3 @@
/gtk2-0.90.9.gem
/gtk2-1.0.0.gem
/gtk2-1.0.3.gem
-/gtk2-1.1.4.gem
diff --git a/rubygem-gtk2.spec b/rubygem-gtk2.spec
index 93d4420..2cdc102 100644
--- a/rubygem-gtk2.spec
+++ b/rubygem-gtk2.spec
@@ -1,37 +1,30 @@
-%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 rubyabi 1.8
-%global header_dir %{ruby_sitearch}
-%global ruby19 0
-%endif
-
-%global gem_name gtk2
+%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
+%global gemname gtk2
+%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
-%global glibminver 1.1.4
-%global pangominver 1.1.3
+%global glibminver 1.0.3
%global obsoleteevr 0.90.7-1.999
+%global rubyabi 1.8
+
Summary: Ruby binding of GTK+-2.x
-Name: rubygem-%{gem_name}
-Version: 1.1.4
-Release: 1%{?dist}
+Name: rubygem-%{gemname}
+Version: 1.0.3
+Release: 2%{?dist}
Group: Development/Languages
# from README
License: LGPLv2
URL: http://ruby-gnome2.sourceforge.jp/
-Source0: http://rubygems.org/downloads/%{gem_name}-%{version}.gem
+Source0: http://rubygems.org/downloads/%{gemname}-%{version}.gem
BuildRequires: ruby(abi) = %{rubyabi}
-BuildRequires: rubygems-devel
+BuildRequires: rubygems
BuildRequires: rubygem-cairo-devel
-BuildRequires: rubygem-glib2-devel >= %{glibminver}
-BuildRequires: rubygem-pango-devel >= %{pangominver}
+BuildRequires: rubygem-glib2-devel
+BuildRequires: rubygem-pango-devel
BuildRequires: ruby-devel
BuildRequires: gtk2-devel
Requires: ruby(abi) = %{rubyabi}
@@ -40,12 +33,7 @@ Requires: rubygem(atk) >= %{glibminver}
Requires: rubygem(gdk_pixbuf2) >= %{glibminver}
Requires: rubygem(glib2) >= %{glibminver}
Requires: rubygem(pango) >= %{glibminver}
-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
+Provides: rubygem(%{gemname}) = %{version}
%description
Ruby/GTK2 is a Ruby binding of GTK+-2.0.x.
@@ -58,8 +46,8 @@ Requires: %{name} = %{version}-%{release}
%description doc
This package contains documentation for %{name}.
-%package -n ruby-%{gem_name}
-Summary: Non-Gem support package for %{gem_name}
+%package -n ruby-%{gemname}
+Summary: Non-Gem support package for %{gemname}
Group: Development/Languages
Requires: %{name} = %{version}-%{release}
# Requires for corresponsing non-gem rpms
@@ -67,10 +55,10 @@ Requires: ruby(atk) >= %{glibminver}
Requires: ruby(gdk_pixbuf2) >= %{glibminver}
Requires: ruby(glib2) >= %{glibminver}
Requires: ruby(pango) >= %{glibminver}
-Provides: ruby(%{gem_name}) = %{version}-%{release}
+Provides: ruby(%{gemname}) = %{version}-%{release}
-%description -n ruby-%{gem_name}
-This package provides non-Gem support for %{gem_name}.
+%description -n ruby-%{gemname}
+This package provides non-Gem support for %{gemname}.
%package devel
Summary: Ruby/GTK development environment
@@ -80,34 +68,32 @@ Requires: ruby-devel
Requires: gtk2-devel
Requires: rubygem-glib2-devel
# Obsoletes / Provides
-# 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
+# ruby(%%{gemname}-devel) Provides is for compatibility
+Obsoletes: ruby-%{gemname}-devel < %{obsoleteevr}
+Provides: ruby-%{gemname}-devel = %{version}-%{release}
+Provides: ruby(%{gemname}-devel) = %{version}-%{release}
%description devel
Header files and libraries for building a extension library for the
-rubygem-%{gem_name}
+rubygem-%{gemname}
%prep
%setup -q -c -T
-mkdir -p .%{gem_dir}
+mkdir -p .%{gemdir}
export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
export CONFIGURE_ARGS="$CONFIGURE_ARGS --with-pkg-config-dir=$(pwd)%{_libdir}/pkgconfig"
gem install \
-V \
--local \
- --install-dir .%{gem_dir} \
+ --install-dir .%{gemdir} \
--force \
--rdoc \
%{SOURCE0}
find . -name \*.gem | xargs chmod 0644
-pushd .%{gem_instdir}
+pushd .%{geminstdir}
# Fix wrong dir
grep -rl /usr/local/bin sample | \
xargs sed -i -e 's|/usr/local/|/usr/|'
@@ -120,15 +106,13 @@ popd
%build
# Move C extension library to some private directory
-pushd .%{gem_instdir}
-%if ! %{ruby19}
+pushd .%{geminstdir}
mkdir lib/ruby-gnome2
-mv lib/%{gem_name}.so lib/ruby-gnome2/
-grep -rl '%{gem_name}.so' . | \
+mv lib/%{gemname}.so lib/ruby-gnome2/
+grep -rl '%{gemname}.so' . | \
xargs sed -i \
- -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
+ -e "\@require at s|'%{gemname}.so'|'ruby-gnome2/%{gemname}.so'|" \
+ -e '\@require at s|"%{gemname}.so"|"ruby-gnome2/%{gemname}.so"|'
# 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|" \
@@ -136,22 +120,15 @@ sed -i -e "/require.*gnome2-raketask/s|^\(.*\)|begin\n \1\nrescue LoadError\n
%install
# Once copy all
-mkdir -p %{buildroot}%{gem_dir}
-cp -a .%{gem_dir}/* \
- %{buildroot}%{gem_dir}/
+mkdir -p %{buildroot}%{gemdir}
+cp -a .%{gemdir}/* \
+ %{buildroot}%{gemdir}/
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 .%{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
+mv .%{geminstdir}/lib/*.h .%{ruby_sitearch}/
+mv .%{geminstdir}/lib/ruby-gnome2/%{gemname}.so .%{ruby_sitearch}/ruby-gnome2/
popd
# move pkgconfig file
@@ -162,8 +139,8 @@ install -cpm 644 ./%{_libdir}/pkgconfig/*.pc \
# Cleanups
pushd %{buildroot}
-rm -rf .%{gem_instdir}/ext/
-rm -f .%{gem_instdir}/extconf.rb
+rm -rf .%{geminstdir}/ext/
+rm -f .%{geminstdir}/extconf.rb
popd
# The following method is completely copied from rubygem-gettext
@@ -171,7 +148,7 @@ popd
#
# Create symlinks
##
-## Note that before switching to gem %%{ruby_sitelib}/%%{gem_name}
+## Note that before switching to gem %%{ruby_sitelib}/%%{gemname}
## already existed as a directory, so this cannot be replaced
## by symlink (cpio fails)
## Similarly, all directories under %%{ruby_sitelib} cannot be
@@ -225,16 +202,14 @@ popd
}
-%if ! %{ruby19}
-create_symlink_rec %{gem_instdir}/lib %{ruby_sitelib}
-%endif
+create_symlink_rec %{geminstdir}/lib %{ruby_sitelib}
%check
# X is needed, disabling.
# Currently it seems that all test succeeds under X
exit 0
-pushd .%{gem_instdir}
+pushd .%{geminstdir}
# kill unneeded make process
rm -rf ./TMPBINDIR
@@ -248,75 +223,43 @@ ruby -Itest ./test/run-test.rb
%files
%defattr(-,root,root,-)
-%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
+%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
# %%ruby_sitearch/ruby-gnome2 is owned by rubygem-glib2
-%{ruby_sitearch}/ruby-gnome2/%{gem_name}.so
-%endif
+%{ruby_sitearch}/ruby-gnome2/%{gemname}.so
-%{gem_cache}
-%{gem_spec}
+%{gemdir}/cache/%{gemname}-%{version}.gem
+%{gemdir}/specifications/%{gemname}-%{version}.gemspec
-%if ! %{ruby19}
-%files -n ruby-%{gem_name}
+%files -n ruby-%{gemname}
%defattr(-,root,root,-)
%{ruby_sitelib}/*.rb
-%{ruby_sitelib}/%{gem_name}/
-%endif
+%{ruby_sitelib}/%{gemname}/
%files devel
%defattr(-,root,root,-)
-%{_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
+%{_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
%files doc
%defattr(-,root,root,-)
-%{gem_dir}/doc/%{gem_name}-%{version}
-%{gem_instdir}/Rakefile
-%{gem_instdir}/sample/
-%{gem_instdir}/test/
+%{gemdir}/doc/%{gemname}-%{version}
+%{geminstdir}/Rakefile
+%{geminstdir}/sample/
+%{geminstdir}/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-4
-- Fix conditionals for F17 to work for RHEL 7 as well.
-
-* Wed Feb 1 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.1.2-3
-- Add proper Obsoletes/Provides
-
-* Tue Jan 31 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.1.2-2
-- 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
-
* Mon Sep 19 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.0.3-2
- 1.0.3
@@ -341,7 +284,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 %%gem_name" works correctly
+- Move C extension so that "require %%gemname" 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 8842d4b..d8ef8f7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7b9f67e1577294bfb9548ff91d43e6ea gtk2-1.1.4.gem
+19966ec247d8b53c3ebe0488db207011 gtk2-1.0.3.gem
More information about the scm-commits
mailing list