[rubygem-atk/f16] Revert "1.1.4"
Mamoru Tasaka
mtasaka at fedoraproject.org
Mon Aug 13 09:43:25 UTC 2012
commit 77027c2379228505a931c32dba88d60b3e11fbbb
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date: Mon Aug 13 18:41:57 2012 +0900
Revert "1.1.4"
This reverts commit dc26dcfadb2c604ee7b5b22e258acf5ab6cec396.
.gitignore | 1 -
rubygem-atk.spec | 169 ++++++++++++++++++------------------------------------
sources | 2 +-
3 files changed, 57 insertions(+), 115 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0bb681d..89dafe5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,3 @@
/atk-0.90.9.gem
/atk-1.0.0.gem
/atk-1.0.3.gem
-/atk-1.1.4.gem
diff --git a/rubygem-atk.spec b/rubygem-atk.spec
index e389cc6..0b5c127 100644
--- a/rubygem-atk.spec
+++ b/rubygem-atk.spec
@@ -1,46 +1,34 @@
-%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 atk
+%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
+%global gemname atk
+%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
-%global glibminver 1.1.4
+%global glibminver 1.0.3
%global obsoleteevr 0.90.7-1.999
+%global rubyabi 1.8
+
Summary: Ruby binding of ATK-1.0.x
-Name: rubygem-%{gem_name}
-Version: 1.1.4
+Name: rubygem-%{gemname}
+Version: 1.0.3
Release: 1%{?dist}
Group: Development/Languages
# from README
License: LGPLv2
URL: http://ruby-gnome2.sourceforge.jp/
-Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
+Source0: http://rubygems.org/gems/%{gemname}-%{version}.gem
BuildRequires: ruby(abi) = %{rubyabi}
-BuildRequires: rubygems-devel
+BuildRequires: rubygems
BuildRequires: rubygem-glib2-devel >= %{glibminver}
BuildRequires: ruby-devel
BuildRequires: atk-devel
Requires: ruby(abi) = %{rubyabi}
Requires: rubygems
Requires: rubygem(glib2) >= %{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/ATK is a Ruby binding of ATK-1.0.x or later.
@@ -53,16 +41,16 @@ 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
Requires: ruby(glib2) >= %{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/ATK development environment
@@ -72,27 +60,25 @@ Requires: ruby-devel
Requires: rubygem-glib2-devel >= %{glibminver}
Requires: atk-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}
@@ -101,15 +87,13 @@ find . -name \*.gem | xargs chmod 0644
%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|" \
@@ -117,34 +101,27 @@ 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
-mkdir -p %{buildroot}%{_libdir}/pkgconfig
+mkdir %{buildroot}%{_libdir}/pkgconfig
install -cpm 644 ./%{_libdir}/pkgconfig/*.pc \
%{buildroot}%{_libdir}/pkgconfig/
# 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
@@ -152,7 +129,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
@@ -206,76 +183,42 @@ popd
}
-%if ! %{ruby19}
-create_symlink_rec %{gem_instdir}/lib %{ruby_sitelib}
-%endif
+create_symlink_rec %{geminstdir}/lib %{ruby_sitelib}
%check
# Currently no testsuite is available
%files
%defattr(-,root,root,-)
-%dir %{gem_instdir}
-%dir %{gem_instdir}/lib/
+%dir %{geminstdir}
+%dir %{geminstdir}/lib/
-%doc %{gem_instdir}/[A-Z]*
-%exclude %{gem_instdir}/Rakefile
+%doc %{geminstdir}/[A-Z]*
+%exclude %{geminstdir}/Rakefile
-%{gem_instdir}/lib/%{gem_name}.rb
-%if ! %{ruby19}
+%{geminstdir}/lib/%{gemname}.rb
# %%ruby_sitearch/ruby-gnome2 is owned by rubygem-glib2
-%{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}
+%{ruby_sitearch}/ruby-gnome2/%{gemname}.so
+
+%{gemdir}/cache/%{gemname}-%{version}.gem
+%{gemdir}/specifications/%{gemname}-%{version}.gemspec
+
+%files -n ruby-%{gemname}
%defattr(-,root,root,-)
%{ruby_sitelib}/*.rb
-%endif
%files devel
%defattr(-,root,root,-)
-%{header_dir}/rbatk.h
-%{header_dir}/rbatkversion.h
-%{_libdir}/pkgconfig/ruby-%{gem_name}.pc
+%{ruby_sitearch}/rbatk.h
+%{ruby_sitearch}/rbatkversion.h
+%{_libdir}/pkgconfig/ruby-%{gemname}.pc
%files doc
%defattr(-,root,root,-)
-%{gem_docdir}/
-%{gem_instdir}/Rakefile
+%{gemdir}/doc/%{gemname}-%{version}
+%{geminstdir}/Rakefile
%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-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Mon Apr 16 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.1.3-2
-- 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
-
-* Sun Jan 29 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-2
-- 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-1
- 1.0.3
@@ -296,7 +239,7 @@ create_symlink_rec %{gem_instdir}/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 %%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
@@ -311,7 +254,7 @@ create_symlink_rec %{gem_instdir}/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-%%gem_name
+- Fix up dependency for ruby-%%gemname
- 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 ed9ec22..4801949 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e4f429f8d590fb601ae01daa561a0df6 atk-1.1.4.gem
+85655a0269d67c0c80fba66edbe1b43f atk-1.0.3.gem
More information about the scm-commits
mailing list