Revert "1.1.4"

This reverts commit 02e2968f4d.
This commit is contained in:
Mamoru Tasaka 2012-08-13 18:46:45 +09:00
commit fe1314fc4d
3 changed files with 71 additions and 106 deletions

1
.gitignore vendored
View file

@ -5,4 +5,3 @@
/gio2-0.90.9.gem
/gio2-1.0.0.gem
/gio2-1.0.3.gem
/gio2-1.1.4.gem

View file

@ -1,47 +1,35 @@
%if 0%{?fedora} >= 17
%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 gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
%global gemname gio2
%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
%global glibminver 1.1.3
%global glibminver 1.0.3
%global obsoleteevr 0.90.7-1.999
%global gem_name gio2
%global rubyabi 1.8
Summary: Ruby binding of gio-2.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
# For Patch0:
BuildRequires: rubygem(rake-compiler)
BuildRequires: rubygem(test-unit)
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/GIO2 is a Ruby binding of gio-2.0.x.
@ -54,16 +42,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/GIO2 development environment
@ -71,41 +59,59 @@ Group: Development/Languages
Requires: %{name} = %{version}-%{release}
Requires: ruby-devel
# Obsoletes / Provides
Obsoletes: ruby-%{gem_name}-devel < %{obsoleteevr}
Provides: ruby-%{gem_name}-devel = %{version}-%{release}
Obsoletes: ruby-%{gemname}-devel < %{obsoleteevr}
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}
%if 0
# For Patch0
TOPDIR=$(pwd)
mkdir tmp_unpack_dir
pushd tmp_unpack_dir
tar xf %SOURCE0
mkdir data ; cd data
tar xf ../data.tar.gz
%patch0 -p1
VERSION=%{version} rake gem
mv pkg/*gem $TOPDIR
popd
%endif
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 \
%if 1
%{SOURCE0}
%else
./%{gemname}-%{version}.gem
%endif
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@s|'%{gem_name}.so'|'ruby-gnome2/%{gem_name}.so'|" \
-e '\@require@s|"%{gem_name}.so"|"ruby-gnome2/%{gem_name}.so"|'
%endif
-e "\@require@s|'%{gemname}.so'|'ruby-gnome2/%{gemname}.so'|" \
-e '\@require@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,21 +123,15 @@ sed -i -e "/glib-test-init/s|^.*$|require 'glib-test-init'|" \
%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
%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
mkdir -p .%{ruby_sitearch}/ruby-gnome2/
# mv .%{geminstdir}/lib/*.h .%{ruby_sitearch}/
mv .%{geminstdir}/lib/ruby-gnome2/%{gemname}.so .%{ruby_sitearch}/ruby-gnome2/
popd
# move pkgconfig file
@ -142,8 +142,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
@ -151,7 +151,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
@ -205,76 +205,42 @@ popd
}
%if ! %{ruby19}
create_symlink_rec %{gem_instdir}/lib %{ruby_sitelib}
%endif
create_symlink_rec %{geminstdir}/lib %{ruby_sitelib}
%check
pushd .%{gem_instdir}
pushd .%{geminstdir}
ruby -rubygems -Ilib test/load-test.rb
%files
%defattr(-,root,root,-)
%dir %{gem_instdir}
%dir %{gem_instdir}/lib/
%dir %{gem_instdir}/lib/%{gem_name}/
%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
%{gem_instdir}/lib/%{gem_name}/deprecated.rb
%if 0%{ruby19}
%dir %{gem_extdir}
%dir %{gem_extdir}/lib
%{gem_extdir}/lib/%{gem_name}.so
%else
%{geminstdir}/lib/%{gemname}.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}/gio2/
%endif
%files devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/ruby-%{gem_name}.pc
%{_libdir}/pkgconfig/ruby-%{gemname}.pc
%files doc
%defattr(-,root,root,-)
%{gem_docdir}
%{gem_instdir}/Rakefile
%{gem_instdir}/test/
%{gemdir}/doc/%{gemname}-%{version}
%{geminstdir}/Rakefile
%{geminstdir}/test/
%changelog
* Mon Aug 13 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 1.1.4-1
- 1.1.4
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Mon Apr 16 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 1.1.3-2
- 1.1.3
* Wed Feb 1 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 1.1.2-4
- Add proper Obsoletes/Provides
* Mon Jan 30 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 1.1.2-3
- 1.1.2
* Sun Jan 15 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 1.1.1-1
- 1.1.1
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@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@fedoraproject.org> - 1.0.3-1
- 1.0.3
@ -298,7 +264,7 @@ ruby -rubygems -Ilib test/load-test.rb
* Sun Oct 31 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.90.5-3
- 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@ioa.s.u-tokyo.ac.jp> - 0.90.4-2
- Initial package

View file

@ -1 +1 @@
733b6d533a9f2b505b2ddae2c7c1a0b1 gio2-1.1.4.gem
e3fb987d391a671e74f952bf52bc6c8e gio2-1.0.3.gem