[rubygem-tilt] Rebuilt for Ruby 1.9.3. Introduced %bootstrap macro to deal with dependency loop for BuildRequires.

Bohuslav Kabrda bkabrda at fedoraproject.org
Tue Jan 24 09:25:22 UTC 2012


commit 2961f63b90606254582bd692bf230d9aa123dfc3
Author: Bohuslav Kabrda <bkabrda at redhat.com>
Date:   Tue Jan 24 10:25:15 2012 +0100

    Rebuilt for Ruby 1.9.3.
    Introduced %bootstrap macro to deal with dependency loop for BuildRequires.

 rubygem-tilt.spec |   77 +++++++++++++++++++++++++++++-----------------------
 1 files changed, 43 insertions(+), 34 deletions(-)
---
diff --git a/rubygem-tilt.spec b/rubygem-tilt.spec
index 1dc37f1..40fe6f9 100644
--- a/rubygem-tilt.spec
+++ b/rubygem-tilt.spec
@@ -1,29 +1,30 @@
-%global gemname tilt
+%global gem_name tilt
 
-%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
-
-%global rubyabi 1.8
+%global rubyabi 1.9.1
+%global bootstrap 1
 
 Summary: Generic interface to multiple Ruby template engines
-Name: rubygem-%{gemname}
+Name: rubygem-%{gem_name}
 Version: 1.3.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Development/Languages
 License: MIT
-URL: http://github.com/rtomayko/%{gemname}
-Source0: http://rubygems.org/gems/%{gemname}-%{version}.gem
+URL: http://github.com/rtomayko/%{gem_name}
+Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
 Requires: ruby(abi) = %{rubyabi}
 Requires: ruby(rubygems)
 Requires: ruby
 BuildRequires: ruby(abi) = %{rubyabi}
-BuildRequires: ruby(rubygems)
+BuildRequires: rubygems-devel
 BuildRequires: ruby
+%if 0%{bootstrap} < 1
+BuildRequires: rubygem(minitest)
 BuildRequires: rubygem(nokogiri)
 BuildRequires: rubygem(erubis)
 BuildRequires: rubygem(haml)
 BuildRequires: rubygem(builder)
 BuildRequires: rubygem(RedCloth)
+%endif
 
 # Markaby test fails. It is probably due to rather old version found in Fedora.
 # https://github.com/rtomayko/tilt/issues/96
@@ -33,7 +34,7 @@ BuildRequires: rubygem(RedCloth)
 # BuildRequires: rubygem(rdiscount)
 
 BuildArch: noarch
-Provides: rubygem(%{gemname}) = %{version}
+Provides: rubygem(%{gem_name}) = %{version}
 
 %description
 Generic interface to multiple Ruby template engines
@@ -49,50 +50,58 @@ 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} \
             --bindir .%{_bindir} \
             --force %{SOURCE0}
 
 %build
 
 %install
-mkdir -p %{buildroot}%{gemdir}
-cp -a .%{gemdir}/* \
-        %{buildroot}%{gemdir}/
+mkdir -p %{buildroot}%{gem_dir}
+cp -a .%{gem_dir}/* \
+        %{buildroot}%{gem_dir}/
 
 mkdir -p %{buildroot}%{_bindir}
 cp -a .%{_bindir}/* \
         %{buildroot}%{_bindir}/
 
-find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x
+find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x
 
 %check
-pushd %{buildroot}%{geminstdir}
+%if 0%{bootstrap} < 1
+pushd %{buildroot}%{gem_instdir}
 RUBYOPT="rubygems Ilib" testrb test/*_test.rb
 popd
+%endif
 
 %files
-%{_bindir}/%{gemname}
-%exclude %{geminstdir}/%{gemname}.gemspec
-%exclude %{geminstdir}/.sass-cache
-%exclude %{geminstdir}/.yardoc
-%exclude %{geminstdir}/Gemfile
-%{geminstdir}/bin
-%{geminstdir}/lib
-%doc %{geminstdir}/COPYING
-%doc %{geminstdir}/README.md
-%doc %{geminstdir}/TEMPLATES.md
-%{gemdir}/cache/%{gemname}-%{version}.gem
-%{gemdir}/specifications/%{gemname}-%{version}.gemspec
+%{_bindir}/%{gem_name}
+%exclude %{gem_instdir}/%{gem_name}.gemspec
+%if "%{bootstrap}" == "0"
+%exclude %{gem_instdir}/.sass-cache
+%exclude %{gem_instdir}/.yardoc
+%endif
+%exclude %{gem_instdir}/Gemfile
+%{gem_instdir}/bin
+%{gem_libdir}
+%doc %{gem_instdir}/COPYING
+%doc %{gem_instdir}/README.md
+%doc %{gem_instdir}/TEMPLATES.md
+%{gem_cache}
+%{gem_spec}
 
 %files doc
-%{geminstdir}/Rakefile
-%doc %{gemdir}/doc/%{gemname}-%{version}
-%{geminstdir}/test
+%{gem_instdir}/Rakefile
+%doc %{gem_docdir}
+%{gem_instdir}/test
 
 
 %changelog
+* Tue Jan 24 2012 Bohuslav Kabrda <bkabrda at redhat.com> - 1.3.3-2
+- Rebuilt for Ruby 1.9.3.
+- Introduced %%bootstrap macro to deal with dependency loop for BuildRequires.
+
 * Mon Jan 16 2012 Bohuslav Kabrda <bkabrda at redhat.com> - 1.3.3-1
 - Updated to tilt 1.3.3.
 - Removed patch that fixed BZ #715713, as it is a part of this version.
@@ -110,7 +119,7 @@ popd
 
 * Thu Feb 10 2011 Vít Ondruch <vondruch at redhat.com> - 1.2.2-2
 - Test moved to doc subpackage
-- %{gemname} macro used whenever possible.
+- %{gem_name} macro used whenever possible.
 
 * Mon Feb 07 2011 Vít Ondruch <vondruch at redhat.com> - 1.2.2-1
 - Initial package


More information about the scm-commits mailing list