From 611bc025e5343cade8320a8d0871fc8053c69356 Mon Sep 17 00:00:00 2001
From: Jeroen van Meeuwen <kanarip@fedoraproject.org>
Date: Sun, 26 Jul 2009 10:42:17 +0000
Subject: 2.3.3-1

---
 rubygem-rails.spec | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'rubygem-rails.spec')

diff --git a/rubygem-rails.spec b/rubygem-rails.spec
index 0ca01a3..cbe208d 100644
--- a/rubygem-rails.spec
+++ b/rubygem-rails.spec
@@ -6,8 +6,8 @@
 
 Summary: Web-application framework
 Name: rubygem-%{gemname}
-Version: 2.3.2
-Release: 3%{?dist}
+Version: 2.3.3
+Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -15,12 +15,16 @@ Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: ruby(rubygems) >= 1.1.1
 Requires: rubygem(rake) >= 0.7.2
+Requires: rubygem(rack) >= 1.0.0
 Requires: rubygem(activesupport) = %{version}
 Requires: rubygem(activerecord) = %{version}
 Requires: rubygem(actionpack) = %{version}
 Requires: rubygem(actionmailer) = %{version}
 Requires: rubygem(activeresource) = %{version}
+
 BuildRequires: rubygems
+BuildRequires: rubygem(rack) >= 1.0.0
+
 BuildArch: noarch
 Provides: rubygem(%{gemname}) = %{version}
 
@@ -48,13 +52,16 @@ find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x
 sed -i '1i#!/usr/bin/ruby\n' %{buildroot}%{geminstdir}/bin/rails
 
 for file in `find %{buildroot}/%{geminstdir}/ -type f -perm /a+x`; do
-  sed -i -re '1s@^#!.*$@#! /usr/bin/ruby@' $file
+  sed -i -e '1c#!/usr/bin/ruby' $file
   chmod 755 $file
 done
 
 # Remove backup files
 find %{buildroot}/%{geminstdir} -type f -name "*~" -delete
 
+# Delete zero-length files
+find %{buildroot}/%{geminstdir} -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
     [ -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 644 $file
@@ -85,6 +92,7 @@ rm -rf %{buildroot}
 %{geminstdir}/doc
 %{geminstdir}/environments
 %{geminstdir}/fresh_rakefile
+%{geminstdir}/guides
 %{geminstdir}/helpers
 %{geminstdir}/html
 %{geminstdir}/lib
@@ -97,11 +105,8 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Wed Jul 24 2009 Scott Seago <sseago@redhat.com> - 2.3.2-3
-- Remove the 'delete zero length files' bit, as some of these are needed.
-
-* Wed May  6 2009 David Lutterkort <lutter@redhat.com> - 2.3.2-2
-- Fix replacement of shebang lines; broke scripts/generate (bz 496480)
+* Sun Jul 26 2009 Jeroen van Meeuwen <j.van.meeuwen@ogd.nl> - 2.3.3-1
+- New upstream version
 
 * Mon Mar 16 2009 Jeroen van Meeuwen <j.van.meeuwen@ogd.nl> - 2.3.2-1
 - New upstream version
-- 
cgit