rpms/rubygem-rails/F-11 rubygem-rails.spec,1.15,1.16

David Lutterkort lutter at fedoraproject.org
Wed Sep 30 17:48:16 UTC 2009


Author: lutter

Update of /cvs/pkgs/rpms/rubygem-rails/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15372/F-11

Modified Files:
	rubygem-rails.spec 
Log Message:
Restore fix for bz #496480


Index: rubygem-rails.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-rails/F-11/rubygem-rails.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- rubygem-rails.spec	26 Sep 2009 16:19:12 -0000	1.15
+++ rubygem-rails.spec	30 Sep 2009 17:48:16 -0000	1.16
@@ -7,7 +7,7 @@
 Summary: Web-application framework
 Name: rubygem-%{gemname}
 Version: 2.3.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -51,8 +51,9 @@ find %{buildroot}%{geminstdir}/bin -type
 # Cleanup some upstream packaging oddities, mostly to make rpmlint happy
 sed -i '1i#!/usr/bin/ruby\n' %{buildroot}%{geminstdir}/bin/rails
 
+# ref: bug 496480
 for file in `find %{buildroot}/%{geminstdir}/ -type f -perm /a+x`; do
-  sed -i -e '1c#!/usr/bin/ruby' $file
+  sed -i -e '1s|%{_bindir}/env ruby|%{_bindir}/ruby|' $file
   chmod 755 $file
 done
 
@@ -105,6 +106,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep 30 2009 David Lutterkort <lutter at redhat.com> - 2.3.3-4
+- Restore fix for bz 496480
+
 * Sun Sep 27 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.3-3
 - Force rebuild
 
@@ -114,6 +118,9 @@ rm -rf %{buildroot}
 * Sun Jul 26 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 2.3.3-1
 - New upstream version
 
+* Wed May  6 2009 David Lutterkort <lutter at redhat.com> - 2.3.2-2
+- Fix replacement of shebang lines; broke scripts/generate (bz 496480)
+
 * Mon Mar 16 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 2.3.2-1
 - New upstream version
 




More information about the fedora-extras-commits mailing list