- Up to 3.0.1, NFY. See TODO.

Changed files:
    ruby-rails.spec -> 1.33

diff --git a/ruby-rails.spec b/ruby-rails.spec
index 5a1384cdf3457dd3bc5c3c3fd040542d4998ac55..186eb6a60d13940609a4c98e79ac40c68990acbd 100644 (file)
--- a/ruby-rails.spec
+++ b/ruby-rails.spec
@@ -1,19 +1,28 @@
+# TODO:
+# - Very rough upgrade to 3.x, need to review sub package architecture in light
+#   of upstream api re-write.
+# - Package various ruby packages as separate subpackages istead of lumping files
+#   together under railtiles? (action_view, action_mailer, etc...)
+#   Or just set provides?
+# - Review deletion of some docs, fix brute force * approach to packaging docs
+#
+%bcond_without  doc # skip (time-consuming) docs generating; intended for speed up test builds
+
 %define pkgname rails
 Summary:       Web-application framework with template engine, control-flow layer, and ORM
 Name:          ruby-%{pkgname}
-Version:       2.3.5
-Release:       1
+Version:       3.0.1
+Release:       0.1
 License:       MIT
 Group:         Development/Languages
-Source0:       http://rubygems.org/downloads/%{pkgname}-%{version}.gem
-# Source0-md5: d09038cee224b1a51ae50eff772cd8f2
-Patch0:                %{name}-paths.patch
+Source0:       http://download.github.com/rails-%{pkgname}-v%{version}-0-gbac6ba9.tar.gz
+# Source0-md5: 0e83bc92ac8d1f8c64b0f6eb70772511
 URL:           http://www.rubyonrails.org/
 BuildRequires: rpmbuild(macros) >= 1.277
-BuildRequires: ruby-modules
-Requires:      ruby-modules >= 1.8.4-1
+BuildRequires: ruby-bundler >= 1.0.3
+BuildRequires: ruby-modules >= 1.9.2
+Requires:      ruby-modules >= 1.9.2
 Requires:      ruby-railties = %{version}-%{release}
-Requires:      ruby-rake >= 0.7.2
 Obsoletes:     railties
 Obsoletes:     ruby-Rails
 #BuildArch:    noarch
@@ -39,11 +48,26 @@ This package contains development tools.
 %package -n ruby-railties
 Summary:       Gluing the Engine to the Rails
 Group:         Development/Languages
-Requires:      ruby-actionmailer = 2.3.5
-Requires:      ruby-actionpack = 2.3.5
-Requires:      ruby-activerecord = 2.3.5
-Requires:      ruby-activeresource = 2.3.5
-Requires:      ruby-activesupport = 2.3.5
+Requires:      ruby-rails = %{version}-%{release}
+#Provides:     ruby-abstractcontroller
+#Provides:     ruby-actioncontroller
+#Provides:     ruby-actiondispatch
+#Provides:     ruby-actionmailer
+#Provides:     ruby-actionpack
+#Provides:     ruby-actionview
+#Provides:     ruby-activemodel
+#Provides:     ruby-activerecord
+#Provides:     ruby-activeresource
+#Provides:     ruby-activesupport
+Obsoletes:     ruby-actioncontroller
+Obsoletes:     ruby-actiondispatch
+Obsoletes:     ruby-actionmailer
+Obsoletes:     ruby-actionpack
+Obsoletes:     ruby-actionview
+Obsoletes:     ruby-activemodel
+Obsoletes:     ruby-activerecord
+Obsoletes:     ruby-activeresource
+Obsoletes:     ruby-activesupport
 
 %description -n ruby-railties
 Rails is a framework for building web-application using CGI, FCGI,
@@ -77,37 +101,35 @@ ri documentation for %{pkgname}.
 Dokumentacji w formacie ri dla %{pkgname}.
 
 %prep
-%setup -qcT
-%{__tar} xf %{SOURCE0} -O data.tar.gz | %{__tar} xz
-find -newer README  -o -print | xargs touch --reference %{SOURCE0}
-%patch0 -p1
+%setup -q -n rails-rails-98a44e1
+find -newer README.rdoc  -o -print | xargs touch --reference %{SOURCE0}
 
 %{__grep} -rl '/usr/bin/env' . | xargs %{__sed} -i -e '
-       s,/usr/bin/env ruby,%{__ruby},
-       s,/usr/bin/env spawn-fcgi,/usr/sbin/spawn-fcgi,
-       s,/usr/bin/env \(#{File.expand_path(\$0)}\),\1,
+       s,%{_bindir}/env ruby,%{__ruby},
+s,%{_bindir}/env spawn-fcgi,%{_sbindir}/spawn-fcgi,
+       s,%{_bindir}/env \(#{File.expand_path(\$0)}\),\1,
 '
 
-# cleanup backups after patching
-find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
-
 %build
-rdoc --ri --op ri lib
-rdoc --op rdoc lib
-rm -r ri/{\<,ActiveSupport,CGI,CodeStatistics,Dir,DispatchServlet} \
-       ri/{Gem,Object,Plugin,RecursiveHTTPFetcher,RemoteCGI} \
-       ri/{SourceAnnotationExtractor,Tracker}
+%if %{with doc}
+rdoc --ri --op ri
+rdoc --op rdoc
+# TODO: why are we selectivly deleting api documentation?
+rm -r ri/{\<,ActiveSupport,CGI,CodeStatistics,Object,Plugin,RecursiveHTTPFetcher}
 rm ri/created.rid
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{pkgname}} \
        $RPM_BUILD_ROOT{%{ruby_rubylibdir},%{ruby_ridir},%{ruby_rdocdir}}
 
-cp -a lib/* $RPM_BUILD_ROOT%{ruby_rubylibdir}
+cp -a {actionmailer,actionpack,activemodel,activerecord,activeresource,activesupport,railties}/lib/* $RPM_BUILD_ROOT%{ruby_rubylibdir}
+%if %{with doc}
 cp -a ri/* $RPM_BUILD_ROOT%{ruby_ridir}
 cp -a rdoc $RPM_BUILD_ROOT%{ruby_rdocdir}/%{name}-%{version}
-cp -a bin builtin configs dispatches doc environments helpers html fresh_rakefile README $RPM_BUILD_ROOT%{_datadir}/%{pkgname}
+%endif
+cp -a bin $RPM_BUILD_ROOT%{_datadir}/%{pkgname}
 install -p bin/rails $RPM_BUILD_ROOT%{_bindir}/rails
 
 cat <<'EOF' > $RPM_BUILD_ROOT%{ruby_rubylibdir}/railties_path.rb
@@ -119,29 +141,41 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/rails
 %{_datadir}/%{pkgname}
-%{ruby_rubylibdir}/commands*
-%{ruby_rubylibdir}/tasks/*
-%{ruby_rubylibdir}/console_*.rb
-%{ruby_rubylibdir}/*_server.rb
+%{ruby_rubylibdir}/%{pkgname}
+%{ruby_rubylibdir}/%{pkgname}.rb
 
+%if %{with doc}
 %files rdoc
 %defattr(644,root,root,755)
 %{ruby_rdocdir}/%{name}-%{version}
 
 %files ri
 %defattr(644,root,root,755)
-%{ruby_ridir}/*Generator
-%{ruby_ridir}/Commands
-%{ruby_ridir}/Listener
-%{ruby_ridir}/Rails*
-%{ruby_ridir}/Repositor*
+%{ruby_ridir}/*
+%endif
 
 %files -n ruby-railties
 %defattr(644,root,root,755)
-%{ruby_rubylibdir}/*
-%exclude %{ruby_rubylibdir}/commands*
-%exclude %{ruby_rubylibdir}/tasks*
-%exclude %{ruby_rubylibdir}/console_*.rb
-%exclude %{ruby_rubylibdir}/*_server.rb
+%{ruby_rubylibdir}/railties_path.rb
+%{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_mailer
+%{ruby_rubylibdir}/action_mailer.rb
+%{ruby_rubylibdir}/action_pack
+%{ruby_rubylibdir}/action_pack.rb
+%{ruby_rubylibdir}/action_view
+%{ruby_rubylibdir}/action_view.rb
+%{ruby_rubylibdir}/active_model
+%{ruby_rubylibdir}/active_model.rb
+%{ruby_rubylibdir}/active_record
+%{ruby_rubylibdir}/active_record.rb
+%{ruby_rubylibdir}/active_resource
+%{ruby_rubylibdir}/active_resource.rb
+%{ruby_rubylibdir}/active_support
+%{ruby_rubylibdir}/active_support.rb