From 4b2cac6b6bcb4f6c8d66a2d4c6e6c3e1f994c8d7 Mon Sep 17 00:00:00 2001 From: Bohuslav Kabrda Date: Tue, 24 Jan 2012 12:48:11 +0100 Subject: [PATCH] Rebuilt for Ruby 1.9.3. --- rubygem-rack.spec | 87 ++++++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 43 deletions(-) diff --git a/rubygem-rack.spec b/rubygem-rack.spec index 8769546..bf8e0af 100644 --- a/rubygem-rack.spec +++ b/rubygem-rack.spec @@ -1,28 +1,26 @@ -%define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) -%define gemname rack -%define geminstdir %{gemdir}/gems/%{gemname}-%{version} +%define gem_name rack -Name: rubygem-%{gemname} +Name: rubygem-%{gem_name} Summary: Common API for connecting web frameworks, web servers and layers of software # Introduce Epoch (related to bug 552972) Epoch: 1 Version: 1.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Languages License: MIT -URL: http://rubyforge.org/projects/%{gemname}/ -Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem +URL: http://rubyforge.org/projects/%{gem_name}/ +Source0: http://gems.rubyforge.org/gems/%{gem_name}-%{version}.gem # These patches fix the test failuers with Ruby 1.8.7-p357 and are already # proposed upstream: https://github.com/rack/rack/pull/298 Patch0: rubygem-rack-test-object-which-responds-to-each.patch Patch1: rubygem-rack-tests-now-accept-different-query-orders.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: rubygems -Requires: ruby(abi) = 1.8 -BuildRequires: rubygems +Requires: ruby(rubygems) +Requires: ruby(abi) = 1.9.1 +BuildRequires: rubygems-devel BuildRequires: rubygem(bacon) BuildArch: noarch -Provides: rubygem(%{gemname}) = %{version} +Provides: rubygem(%{gem_name}) = %{version} %description Rack provides a common API for connecting web frameworks, @@ -30,11 +28,11 @@ web servers and layers of software in between %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 %{SOURCE0} -pushd .%{geminstdir} +pushd .%{gem_instdir} %patch0 -p1 %patch1 -p1 popd @@ -43,65 +41,68 @@ popd %install rm -rf %{buildroot} -mkdir -p %{buildroot}%{gemdir} -cp -a .%{gemdir}/* \ - %{buildroot}%{gemdir}/ +mkdir -p %{buildroot}%{gem_dir} +cp -a .%{gem_dir}/* \ + %{buildroot}%{gem_dir}/ # Remove backup files -find %{buildroot}/%{geminstdir} -type f -name "*~" -delete +find %{buildroot}/%{gem_instdir} -type f -name "*~" -delete # Delete zero-length files -find %{buildroot}/%{geminstdir} -type f -size 0c -exec rm -rvf {} \; +find %{buildroot}/%{gem_instdir} -type f -size 0c -exec rm -rvf {} \; # Fix anything executable that does not have a shebang -for file in `find %{buildroot}/%{geminstdir} -type f -perm /a+x`; do +for file in `find %{buildroot}/%{gem_instdir} -type f -perm /a+x`; do [ -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 644 $file done # Find files with a shebang that do not have executable permissions -for file in `find %{buildroot}/%{geminstdir} -type f ! -perm /a+x -name "*.rb"`; do +for file in `find %{buildroot}/%{gem_instdir} -type f ! -perm /a+x -name "*.rb"`; do [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 755 $file done # Find files that have non-standard-executable-perm -find %{buildroot}/%{geminstdir} -type f -perm /g+wx -exec chmod -v g-w {} \; +find %{buildroot}/%{gem_instdir} -type f -perm /g+wx -exec chmod -v g-w {} \; # Find files that are not readable -find %{buildroot}/%{geminstdir} -type f ! -perm /go+r -exec chmod -v go+r {} \; +find %{buildroot}/%{gem_instdir} -type f ! -perm /go+r -exec chmod -v go+r {} \; -# Move %%{gemdir}/bin/rackup to %%{_bindir} +# Move %%{gem_dir}/bin/rackup to %%{_bindir} mkdir -p %{buildroot}/%{_bindir} -mv %{buildroot}/%{gemdir}/bin/rackup %{buildroot}/%{_bindir} -rm -rf %{buildroot}/%{gemdir}/bin/ +mv %{buildroot}/%{gem_dir}/bin/rackup %{buildroot}/%{_bindir} +rm -rf %{buildroot}/%{gem_dir}/bin/ %clean rm -rf %{buildroot} %check -pushd %{buildroot}%{geminstdir} +pushd %{buildroot}%{gem_instdir} bacon --automatic --quiet popd %files %defattr(-, root, root, -) -%dir %{geminstdir} -%doc %{gemdir}/doc/%{gemname}-%{version} -%doc %{geminstdir}/COPYING -%doc %{geminstdir}/Rakefile -%doc %{geminstdir}/README.rdoc -%doc %{geminstdir}/KNOWN-ISSUES -%doc %{geminstdir}/SPEC -%doc %{geminstdir}/example -%doc %{geminstdir}/test -%doc %{geminstdir}/contrib -%{geminstdir}/%{gemname}.gemspec -%{geminstdir}/lib -%{geminstdir}/bin +%dir %{gem_instdir} +%doc %{gem_docdir} +%doc %{gem_instdir}/COPYING +%doc %{gem_instdir}/Rakefile +%doc %{gem_instdir}/README.rdoc +%doc %{gem_instdir}/KNOWN-ISSUES +%doc %{gem_instdir}/SPEC +%doc %{gem_instdir}/example +%doc %{gem_instdir}/test +%doc %{gem_instdir}/contrib +%{gem_instdir}/%{gem_name}.gemspec +%{gem_libdir} +%{gem_instdir}/bin %{_bindir}/rackup -%{gemdir}/cache/%{gemname}-%{version}.gem -%{gemdir}/specifications/%{gemname}-%{version}.gemspec +%{gem_cache} +%{gem_spec} %changelog +* Tue Jan 24 2012 Bohuslav Kabrda - 1:1.4.0-2 +- Rebuilt for Ruby 1.9.3. + * Thu Jan 05 2012 Bohuslav Kabrda - 1:1.4.0-1 - Update to Rack 1.4. - Moved gem install to %%prep to be able to apply patches. @@ -139,7 +140,7 @@ popd * Sun Nov 09 2008 Jeroen van Meeuwen - 0.4.0-2 - Remove unused macro (#470694) - Add ruby(abi) = 1.8 as required by package guidelines (#470694) -- Move %%{gemdir}/bin/rackup to %%{_bindir} (#470694) +- Move %%{gem_dir}/bin/rackup to %%{_bindir} (#470694) * Sat Nov 08 2008 Jeroen van Meeuwen - 0.4.0-1 - Initial package