[rubygem-sinatra] Rebuilt for Ruby 1.9.3. Introduced %bootstrap macro to deal with dependency loop.
Bohuslav Kabrda
bkabrda at fedoraproject.org
Tue Jan 24 12:35:58 UTC 2012
commit bfa17b42aac68942dab7fce7ddbf6102b05f0a2d
Author: Bohuslav Kabrda <bkabrda at redhat.com>
Date: Tue Jan 24 13:35:50 2012 +0100
Rebuilt for Ruby 1.9.3.
Introduced %bootstrap macro to deal with dependency loop.
rubygem-sinatra.spec | 72 +++++++++++++++++++++++++++----------------------
sources | 4 ---
2 files changed, 40 insertions(+), 36 deletions(-)
---
diff --git a/rubygem-sinatra.spec b/rubygem-sinatra.spec
index cbf8b29..d43330e 100644
--- a/rubygem-sinatra.spec
+++ b/rubygem-sinatra.spec
@@ -1,28 +1,30 @@
-%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%global gemname sinatra
-%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
+%global gem_name sinatra
+
+%global bootstrap 1
Summary: Ruby-based web application framework
-Name: rubygem-%{gemname}
+Name: rubygem-%{gem_name}
Version: 1.3.2
-Release: 6%{?dist}
+Release: 7%{?dist}
Group: Development/Languages
License: MIT
URL: http://sinatra.rubyforge.org
-Source0: http://rubygems.org/downloads/%{gemname}-%{version}.gem
+Source0: http://rubygems.org/downloads/%{gem_name}-%{version}.gem
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: ruby(abi) = 1.8
-Requires: rubygems
+Requires: ruby(abi) = 1.9.1
+Requires: ruby(rubygems)
Requires: rubygem(rack) >= 1.3.0
Requires: rubygem(rack-protection)
Requires: rubygem(tilt)
-BuildRequires: rubygems
+BuildRequires: rubygems-devel
+%if 0%{bootstrap} < 1
BuildRequires: rubygem(rack) >= 1.3.0
BuildRequires: rubygem(rack-test)
BuildRequires: rubygem(rack-protection)
BuildRequires: rubygem(tilt)
+%endif
BuildArch: noarch
-Provides: rubygem(%{gemname}) = %{version}
+Provides: rubygem(%{gem_name}) = %{version}
Epoch: 1
%description
@@ -41,43 +43,49 @@ This package contains documentation for %{name}.
%prep
%setup -q -c -T
-%{__mkdir_p} .%{gemdir}
-gem install --local --install-dir .%{gemdir} \
+%{__mkdir_p} .%{gem_dir}
+gem install --local --install-dir .%{gem_dir} \
--force -V %{SOURCE0}
%build
%check
-pushd .%{geminstdir}
+%if 0%{bootstrap} < 1
+pushd .%{gem_instdir}
%define test_files $(find * -path 'test/*_test.rb' -not -path "test/filter_test.rb" -not -path "test/integration_test.rb" | awk '{ print "-r"$1 }')
-ruby -I. -rubygems %{test_files} -e ""
+ruby -I. %{test_files} -e ""
popd
+%endif
%install
-mkdir -p %{buildroot}%{gemdir}
-cp -rv .%{gemdir}/* %{buildroot}%{gemdir}
-rm %{buildroot}/%geminstdir/.yardopts # Remove YARD configuration
+mkdir -p %{buildroot}%{gem_dir}
+cp -rv .%{gem_dir}/* %{buildroot}%{gem_dir}
+rm %{buildroot}/%gem_instdir/.yardopts # Remove YARD configuration
%files
-%dir %{geminstdir}
-%{geminstdir}/lib
-%{geminstdir}/sinatra.gemspec
-%{geminstdir}/test
-%{geminstdir}/Rakefile
-%{gemdir}/cache/%{gemname}-%{version}.gem
-%{gemdir}/specifications/%{gemname}-%{version}.gemspec
+%dir %{gem_instdir}
+%{gem_libdir}
+%{gem_instdir}/sinatra.gemspec
+%{gem_instdir}/test
+%{gem_instdir}/Rakefile
+%{gem_cache}
+%{gem_spec}
%files doc
-%{gemdir}/doc/%{gemname}-%{version}
-%{geminstdir}/README.rdoc
-%{geminstdir}/README.*.rdoc
-%{geminstdir}/LICENSE
-%{geminstdir}/AUTHORS
-%{geminstdir}/CHANGES
-%{geminstdir}/examples
-%{geminstdir}/Gemfile
+%{gem_docdir}
+%{gem_instdir}/README.rdoc
+%{gem_instdir}/README.*.rdoc
+%{gem_instdir}/LICENSE
+%{gem_instdir}/AUTHORS
+%{gem_instdir}/CHANGES
+%{gem_instdir}/examples
+%{gem_instdir}/Gemfile
%changelog
+* Tue Jan 24 2012 Bohuslav Kabrda <bkabrda at redhat.com> - 1:1.3.2-7
+- Rebuilt for Ruby 1.9.3.
+- Introduced %%bootstrap macro to deal with dependency loop.
+
* Mon Jan 02 2012 Michal Fojtik <mfojtik at redhat.com> - 1.3.2-6
- Fixed Epoch once again
diff --git a/sources b/sources
index 1a35585..330023d 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-58dd78900b2b945f12665ed29d33a909 sinatra-1.0.gem
-f72c6f5bf5f1926dda7c7be655b23a17 sinatra-1.1.2.gem
-22cc56449f5809af896554c2f10e6441 sinatra-1.2.0.gem
-15c89951749f866ddaa69b7eb1a108b6 sinatra-1.2.6.gem
1d325d1317f46e3c6f57320f53178c3b sinatra-1.3.2.gem
More information about the scm-commits
mailing list