From 731d4222b17d929726e52487d0d067ad9638d56c Mon Sep 17 00:00:00 2001 From: Jeroen van Meeuwen Date: Jul 26 2009 11:46:22 +0000 Subject: 2.3.3-1 --- diff --git a/.cvsignore b/.cvsignore index d7d4bf3..8b7a0c5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -rails-2.3.2.gem +rails-2.3.3.gem diff --git a/import.log b/import.log index 90958ee..9f9a05a 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ rubygem-rails-2_3_2-1_fc10:HEAD:rubygem-rails-2.3.2-1.fc10.src.rpm:1237207120 +rubygem-rails-2_3_3-1_fc11:F-11:rubygem-rails-2.3.3-1.fc11.src.rpm:1248608760 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 - 2.3.2-3 -- Remove the 'delete zero length files' bit, as some of these are needed. - -* Wed May 6 2009 David Lutterkort - 2.3.2-2 -- Fix replacement of shebang lines; broke scripts/generate (bz 496480) +* Sun Jul 26 2009 Jeroen van Meeuwen - 2.3.3-1 +- New upstream version * Mon Mar 16 2009 Jeroen van Meeuwen - 2.3.2-1 - New upstream version diff --git a/sources b/sources index 8effb17..7b15dfa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b52822c4c0aa50726e3943181bcaf883 rails-2.3.2.gem +776547f3b8e4f205b389fa2f677b20dc rails-2.3.3.gem