[packages/ruby-actionpack] - up to 3.2.19
baggins
baggins at pld-linux.org
Sun Aug 31 22:14:21 CEST 2014
commit 8098892e901b2e88f71134669243e31bbb18372f
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Aug 31 22:14:11 2014 +0200
- up to 3.2.19
ruby-actionpack-nogems.patch | 75 --------------------------------------------
ruby-actionpack.spec | 33 ++++++++++++-------
2 files changed, 22 insertions(+), 86 deletions(-)
---
diff --git a/ruby-actionpack.spec b/ruby-actionpack.spec
index 9be14ba..cb31e51 100644
--- a/ruby-actionpack.spec
+++ b/ruby-actionpack.spec
@@ -2,13 +2,12 @@
Summary: Object-Relational mapping library for Ruby
Summary(pl.UTF-8): Biblioteka odwzorowań obiektowo-relacyjnych dla Ruby
Name: ruby-%{pkgname}
-Version: 2.3.16
-Release: 2
+Version: 3.2.19
+Release: 0.1
License: Ruby-alike
Group: Development/Languages
Source0: http://rubygems.org/downloads/%{pkgname}-%{version}.gem
-# Source0-md5: 5cee7f8665b44fb6affe47e6d479011c
-Patch0: %{name}-nogems.patch
+# Source0-md5: e44a409d81fd2b487b12850bcd10cf0d
URL: http://rubyforge.org/projects/actionpack/
BuildRequires: rpmbuild(macros) >= 1.277
BuildRequires: ruby >= 1:1.8.6
@@ -64,16 +63,16 @@ ri documentation for %{pkgname}.
Dokumentacji w formacie ri dla %{pkgname}.
%prep
-%setup -q -c
-%{__tar} xf %{SOURCE0} -O data.tar.gz | %{__tar} xz
-find -newer README -o -print | xargs touch --reference %{SOURCE0}
-%patch0 -p1
+%setup -q -n %{pkgname}-%{version}
%build
+# write .gemspec
+%__gem_helper spec
+
LC_ALL=en_US.UTF-8 rdoc --ri --op ri lib
LC_ALL=en_US.UTF-8 rdoc --op rdoc lib
rm ri/created.rid
-rm -fr ri/{CGI,FalseClass,HTML,Mime,NilClass,Object,RackLintPatch,Regexp,TrueClass}
+rm -fr ri/{system,Rack,CGI,FalseClass,HTML,Mime,NilClass,Object,RackLintPatch,Regexp,TrueClass}
%install
rm -rf $RPM_BUILD_ROOT
@@ -83,19 +82,28 @@ cp -a lib/* $RPM_BUILD_ROOT%{ruby_rubylibdir}
cp -a ri/* $RPM_BUILD_ROOT%{ruby_ridir}
cp -a rdoc $RPM_BUILD_ROOT%{ruby_rdocdir}/%{pkgname}-%{version}-%{release}
+# install gemspec
+install -d $RPM_BUILD_ROOT%{ruby_specdir}
+cp -p %{pkgname}-%{version}.gemspec $RPM_BUILD_ROOT%{ruby_specdir}
+
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc README
+%doc README.rdoc
+%{ruby_rubylibdir}/abstract_controller
+%{ruby_rubylibdir}/abstract_controller.rb
%{ruby_rubylibdir}/action_controller
%{ruby_rubylibdir}/action_controller.rb
+%{ruby_rubylibdir}/action_dispatch
+%{ruby_rubylibdir}/action_dispatch.rb
%{ruby_rubylibdir}/action_pack
%{ruby_rubylibdir}/action_pack.rb
-%{ruby_rubylibdir}/actionpack.rb
%{ruby_rubylibdir}/action_view
%{ruby_rubylibdir}/action_view.rb
+%{ruby_rubylibdir}/sprockets
+%{ruby_specdir}/%{pkgname}-%{version}.gemspec
%files rdoc
%defattr(644,root,root,755)
@@ -103,5 +111,8 @@ rm -rf $RPM_BUILD_ROOT
%files ri
%defattr(644,root,root,755)
+%{ruby_ridir}/AbstractController
%{ruby_ridir}/ActionController
+%{ruby_ridir}/ActionDispatch
%{ruby_ridir}/ActionView
+%{ruby_ridir}/Sprockets
diff --git a/ruby-actionpack-nogems.patch b/ruby-actionpack-nogems.patch
deleted file mode 100644
index 8e0a4d5..0000000
--- a/ruby-actionpack-nogems.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-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.1.0'
-+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.expand_path('../../../activerecord/lib', __FILE__)
-- 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'
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ruby-actionpack.git/commitdiff/8098892e901b2e88f71134669243e31bbb18372f
More information about the pld-cvs-commit
mailing list