2.3.2-1

4 files changed, 35 insertions, 14 deletions

diff --git a/.cvsignore b/.cvsignore
index 94a4bd6..d7d4bf3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-rails-2.2.2.gem
+rails-2.3.2.gem
diff --git a/import.log b/import.log
new file mode 100644
index 0000000..90958ee
--- /dev/null
+++ b/import.log
@@ -0,0 +1 @@
+rubygem-rails-2_3_2-1_fc10:HEAD:rubygem-rails-2.3.2-1.fc10.src.rpm:1237207120
diff --git a/rubygem-rails.spec b/rubygem-rails.spec
index 08d5be7..3183fc6 100644
--- a/rubygem-rails.spec
+++ b/rubygem-rails.spec
@@ -6,8 +6,8 @@
 
 Summary: Web-application framework
 Name: rubygem-%{gemname}
-Version: 2.2.2
-Release: 2%{?dist}
+Version: 2.3.2
+Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -45,17 +45,35 @@ rmdir %{buildroot}%{gemdir}/bin
 find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x
 
 # Cleanup some upstream packaging oddities, mostly to make rpmlint happy
-sed -i '1i#! /usr/bin/ruby\n' %{buildroot}%{geminstdir}/bin/rails
-
-for f in dispatches/dispatch.fcgi dispatches/dispatch.rb \
-         dispatches/gateway.cgi lib/commands/ncgi/listener \
-         lib/commands/ncgi/tracker \
-         lib/commands/performance/request.rb
-do
-  sed -i -e '1c#! /usr/bin/ruby' %{buildroot}%{geminstdir}/$f
-  chmod 755 %{buildroot}%{geminstdir}/$f
+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 -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
 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
+    [ ! -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 files that are not readable
+find %{buildroot}/%{geminstdir} -type f ! -perm /go+r -exec chmod -v go+r {} \;
+
 %clean
 rm -rf %{buildroot}
 
@@ -66,7 +84,6 @@ rm -rf %{buildroot}
 %{geminstdir}/builtin
 %doc %{geminstdir}/CHANGELOG
 %{geminstdir}/configs
-%{geminstdir}/config.ru
 %{geminstdir}/dispatches
 %{geminstdir}/doc
 %{geminstdir}/environments
@@ -83,6 +100,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Mar 16 2009 Jeroen van Meeuwen <j.van.meeuwen@ogd.nl> - 2.3.2-1
+- New upstream version
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
diff --git a/sources b/sources
index 022ebae..8effb17 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c7dafb883fd28f10c9311189e15a1d5d  rails-2.2.2.gem
+b52822c4c0aa50726e3943181bcaf883  rails-2.3.2.gem