Author: baggins Date: Mon Mar 1 00:52:25 2010 GMT Module: packages Tag: HEAD ---- Log message: - we don't use gems and stuff
---- Files affected: packages/ruby-actionpack: ruby-actionpack.spec (1.31 -> 1.32) , ruby-actionpack-nogems.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/ruby-actionpack/ruby-actionpack.spec diff -u packages/ruby-actionpack/ruby-actionpack.spec:1.31 packages/ruby-actionpack/ruby-actionpack.spec:1.32 --- packages/ruby-actionpack/ruby-actionpack.spec:1.31 Sun Feb 28 17:30:11 2010 +++ packages/ruby-actionpack/ruby-actionpack.spec Mon Mar 1 01:52:20 2010 @@ -9,11 +9,13 @@ Group: Development/Languages Source0: http://rubygems.org/downloads/%{pkgname}-%{version}.gem # Source0-md5: c32297f6e4af8ac9971dbc116e98a636 +Patch0: %{name}-nogems.patch URL: http://rubyforge.org/projects/actionpack/ BuildRequires: rpmbuild(macros) >= 1.277 BuildRequires: ruby >= 1:1.8.6 BuildRequires: ruby-modules %{?ruby_mod_ver_requires_eq} +Requires: ruby-rack >= 1.0.1 Obsoletes: ruby-ActionPack Provides: ruby-ActionPack #BuildArch: noarch @@ -52,9 +54,9 @@ %prep %setup -q -c - %{__tar} xf %{SOURCE0} -O data.tar.gz | %{__tar} xz find -newer README -o -print | xargs touch --reference %{SOURCE0} +%patch0 -p1 %build rdoc --ri --op ri lib @@ -107,6 +109,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.32 2010/03/01 00:52:20 baggins +- we don't use gems and stuff + Revision 1.31 2010/02/28 16:30:11 baggins - 2.3.5 ================================================================ Index: packages/ruby-actionpack/ruby-actionpack-nogems.patch diff -u /dev/null packages/ruby-actionpack/ruby-actionpack-nogems.patch:1.1 --- /dev/null Mon Mar 1 01:52:25 2010 +++ packages/ruby-actionpack/ruby-actionpack-nogems.patch Mon Mar 1 01:52:20 2010 @@ -0,0 +1,75 @@ +diff --git a/lib/action_controller.rb b/lib/action_controller.rb +index f53ba27..91dfe3d 100644 +--- a/lib/action_controller.rb ++++ b/lib/action_controller.rb +@@ -21,17 +21,7 @@ + # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + #++ + +-begin +- require 'active_support' +-rescue LoadError +- activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib" +- if File.directory?(activesupport_path) +- $:.unshift activesupport_path +- require 'active_support' +- end +-end +- +-gem 'rack', '~> 1.0.1' ++require 'active_support' + require 'rack' + require 'action_controller/cgi_ext' + +diff --git a/lib/action_view.rb b/lib/action_view.rb +index 1f1ff9d..f845df1 100644 +--- a/lib/action_view.rb ++++ b/lib/action_view.rb +@@ -21,15 +21,7 @@ + # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + #++ + +-begin +- require 'active_support' +-rescue LoadError +- activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib" +- if File.directory?(activesupport_path) +- $:.unshift activesupport_path +- require 'active_support' +- end +-end ++require 'active_support' + + module ActionView + def self.load_all! +diff --git a/test/abstract_unit.rb b/test/abstract_unit.rb +index 8acc451..8476764 100644 +--- a/test/abstract_unit.rb ++++ b/test/abstract_unit.rb +@@ -3,12 +3,10 @@ $:.unshift(File.dirname(__FILE__) + '/../../activesupport/lib') + $:.unshift(File.dirname(__FILE__) + '/fixtures/helpers') + $:.unshift(File.dirname(__FILE__) + '/fixtures/alternate_helpers') + +-require 'rubygems' + require 'yaml' + require 'stringio' + require 'test/unit' + +-gem 'mocha', '>= 0.9.7' + require 'mocha' + + begin +diff --git a/test/active_record_unit.rb b/test/active_record_unit.rb +index 9e0c660..a63782b 100644 +--- a/test/active_record_unit.rb ++++ b/test/active_record_unit.rb +@@ -16,9 +16,6 @@ if defined?(ActiveRecord) && defined?(Fixtures) + else + $stderr.print 'Attempting to load Active Record... ' + begin +- PATH_TO_AR = "#{File.dirname(__FILE__)}/../../activerecord/lib" +- raise LoadError, "#{PATH_TO_AR} doesn't exist" unless File.directory?(PATH_TO_AR) +- $LOAD_PATH.unshift PATH_TO_AR + require 'active_record' + require 'active_record/fixtures' + $stderr.puts 'success' ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ruby-actionpack/ruby-actionpack.spec?r1=1.31&r2=1.32&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
