packages: ruby-rails2/ruby-rails2.spec - 2.3.5 as separate package (needed ...

baggins baggins at pld-linux.org
Wed Jun 22 12:54:41 CEST 2011


Author: baggins                      Date: Wed Jun 22 10:54:41 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 2.3.5 as separate package (needed by redmine)

---- Files affected:
packages/ruby-rails2:
   ruby-rails2.spec (1.35 -> 1.36) 

---- Diffs:

================================================================
Index: packages/ruby-rails2/ruby-rails2.spec
diff -u packages/ruby-rails2/ruby-rails2.spec:1.35 packages/ruby-rails2/ruby-rails2.spec:1.36
--- packages/ruby-rails2/ruby-rails2.spec:1.35	Mon Oct 25 11:12:20 2010
+++ packages/ruby-rails2/ruby-rails2.spec	Wed Jun 22 12:54:36 2011
@@ -1,33 +1,20 @@
 # $Revision$, $Date$
-# 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
-# - Fix Source0, can be fetched with wget from:
-#   http://github.com/rails/rails/tarball/v3.0.1
-#
-%bcond_without  doc # skip (time-consuming) docs generating; intended for speed up test builds
-
-%define gitrev gbac6ba9
 %define pkgname rails
-
 Summary:	Web-application framework with template engine, control-flow layer, and ORM
 Name:		ruby-%{pkgname}
-Version:	3.0.1
-Release:	0.1
+Version:	2.3.5
+Release:	1
 License:	MIT
 Group:		Development/Languages
-Source0:	http://download.github.com/rails-%{pkgname}-v%{version}-0-%{gitrev}.tar.gz
-# Source0-md5:	0e83bc92ac8d1f8c64b0f6eb70772511
+Source0:	http://rubygems.org/downloads/%{pkgname}-%{version}.gem
+# Source0-md5:	d09038cee224b1a51ae50eff772cd8f2
+Patch0:		%{name}-paths.patch
 URL:		http://www.rubyonrails.org/
 BuildRequires:	rpmbuild(macros) >= 1.277
-BuildRequires:	ruby-bundler >= 1.0.3
-BuildRequires:	ruby-modules >= 1.9.2
-Requires:	ruby-modules >= 1.9.2
+BuildRequires:	ruby-modules
+Requires:	ruby-modules >= 1.8.4-1
 Requires:	ruby-railties = %{version}-%{release}
+Requires:	ruby-rake >= 0.7.2
 Obsoletes:	railties
 Obsoletes:	ruby-Rails
 #BuildArch:	noarch
@@ -53,26 +40,11 @@
 %package -n ruby-railties
 Summary:	Gluing the Engine to the Rails
 Group:		Development/Languages
-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
+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
 
 %description -n ruby-railties
 Rails is a framework for building web-application using CGI, FCGI,
@@ -106,35 +78,37 @@
 Dokumentacji w formacie ri dla %{pkgname}.
 
 %prep
-%setup -q -n rails-rails-98a44e1
-find -newer README.rdoc  -o -print | xargs touch --reference %{SOURCE0}
+%setup -qcT
+%{__tar} xf %{SOURCE0} -O data.tar.gz | %{__tar} xz
+find -newer README  -o -print | xargs touch --reference %{SOURCE0}
+%patch0 -p1
 
 %{__grep} -rl '/usr/bin/env' . | xargs %{__sed} -i -e '
-	s,%{_bindir}/env ruby,%{__ruby},
-s,%{_bindir}/env spawn-fcgi,%{_sbindir}/spawn-fcgi,
-	s,%{_bindir}/env \(#{File.expand_path(\$0)}\),\1,
+	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,
 '
 
+# cleanup backups after patching
+find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
+
 %build
-%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}
+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}
 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 {actionmailer,actionpack,activemodel,activerecord,activeresource,activesupport,railties}/lib/* $RPM_BUILD_ROOT%{ruby_rubylibdir}
-%if %{with doc}
+cp -a lib/* $RPM_BUILD_ROOT%{ruby_rubylibdir}
 cp -a ri/* $RPM_BUILD_ROOT%{ruby_ridir}
 cp -a rdoc $RPM_BUILD_ROOT%{ruby_rdocdir}/%{name}-%{version}
-%endif
-cp -a bin $RPM_BUILD_ROOT%{_datadir}/%{pkgname}
+cp -a bin builtin configs dispatches doc environments helpers html fresh_rakefile README $RPM_BUILD_ROOT%{_datadir}/%{pkgname}
 install -p bin/rails $RPM_BUILD_ROOT%{_bindir}/rails
 
 cat <<'EOF' > $RPM_BUILD_ROOT%{ruby_rubylibdir}/railties_path.rb
@@ -146,44 +120,32 @@
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/rails
+%attr(755,root,root) %{_bindir}/*
 %{_datadir}/%{pkgname}
-%{ruby_rubylibdir}/%{pkgname}
-%{ruby_rubylibdir}/%{pkgname}.rb
+%{ruby_rubylibdir}/commands*
+%{ruby_rubylibdir}/tasks/*
+%{ruby_rubylibdir}/console_*.rb
+%{ruby_rubylibdir}/*_server.rb
 
-%if %{with doc}
 %files rdoc
 %defattr(644,root,root,755)
 %{ruby_rdocdir}/%{name}-%{version}
 
 %files ri
 %defattr(644,root,root,755)
-%{ruby_ridir}/*
-%endif
+%{ruby_ridir}/*Generator
+%{ruby_ridir}/Commands
+%{ruby_ridir}/Listener
+%{ruby_ridir}/Rails*
+%{ruby_ridir}/Repositor*
 
 %files -n ruby-railties
 %defattr(644,root,root,755)
-%{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
+%{ruby_rubylibdir}/*
+%exclude %{ruby_rubylibdir}/commands*
+%exclude %{ruby_rubylibdir}/tasks*
+%exclude %{ruby_rubylibdir}/console_*.rb
+%exclude %{ruby_rubylibdir}/*_server.rb
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -191,6 +153,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2011/06/22 10:54:36  baggins
+- 2.3.5 as separate package (needed by redmine)
+
 Revision 1.35  2010/10/25 09:12:20  caleb
 - Added gitrev to automate source fetching a little
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ruby-rails2/ruby-rails2.spec?r1=1.35&r2=1.36&f=u



More information about the pld-cvs-commit mailing list