packages: ruby-actionmailer/ruby-actionmailer.spec, ruby-actionmailer/ruby-...

[baggins]

Author: baggins                      Date: Tue Mar  2 22:19:04 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added ri package
- we have tmail and text-format in distro, so kill vendor stuff

---- Files affected:
packages/ruby-actionmailer:
   ruby-actionmailer.spec (1.26 -> 1.27) , ruby-actionmailer-vendor.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/ruby-actionmailer/ruby-actionmailer.spec
diff -u packages/ruby-actionmailer/ruby-actionmailer.spec:1.26 packages/ruby-actionmailer/ruby-actionmailer.spec:1.27
--- packages/ruby-actionmailer/ruby-actionmailer.spec:1.26	Sun Feb 28 17:33:04 2010
+++ packages/ruby-actionmailer/ruby-actionmailer.spec	Tue Mar  2 23:18:59 2010
@@ -9,12 +9,13 @@
 Group:		Development/Languages
 Source0:	http://rubygems.org/downloads/%{pkgname}-%{version}.gem
 # Source0-md5:	623772ef110fe42f4fbefbf99d8c3524
+Patch0:		%{name}-vendor.patch
 URL:		http://rubyforge.org/projects/actionmailer/
 BuildRequires:	rpmbuild(macros) >= 1.484
 BuildRequires:	ruby >= 1:1.8.6
 BuildRequires:	ruby-modules
 %{?ruby_mod_ver_requires_eq}
-Requires:	ruby-actionpack >= 1.7.0
+Requires:	ruby-actionpack >= 2.3.5
 Requires:	ruby-tmail
 Requires:	ruby-text-format
 Obsoletes:	ruby-ActionMailer
@@ -45,22 +46,36 @@
 %description rdoc -l pl.UTF-8
 Dokumentacja do biblioteki ActionMailer.
 
+%package ri
+Summary:	ri documentation for %{pkgname}
+Summary(pl.UTF-8):	Dokumentacja w formacie ri dla %{pkgname}
+Group:		Documentation
+Requires:	ruby
+
+%description ri
+ri documentation for %{pkgname}.
+
+%description ri -l pl.UTF-8
+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
+
+rm -r lib/action_mailer/vendor
 
 %build
 rdoc --ri --op ri lib
 rdoc --op rdoc lib
-%{__rm} -f ri/created.rid
-# external pkgs?
-rm -rf ri/Test
+rm ri/created.rid
+rm -r ri/{Net,Test,Text}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{ruby_rubylibdir},%{ruby_ridir},%{ruby_rdocdir}}
+
 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}
@@ -78,6 +93,9 @@
 %files rdoc
 %defattr(644,root,root,755)
 %{ruby_rdocdir}/%{pkgname}-%{version}-%{release}
+
+%files ri
+%defattr(644,root,root,755)
 %{ruby_ridir}/ActionMailer
 %{ruby_ridir}/MailHelper
 
@@ -87,6 +105,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27  2010/03/02 22:18:59  baggins
+- added ri package
+- we have tmail and text-format in distro, so kill vendor stuff
+
 Revision 1.26  2010/02/28 16:33:04  baggins
 - 2.3.5
 - updated requires

================================================================
Index: packages/ruby-actionmailer/ruby-actionmailer-vendor.patch
diff -u /dev/null packages/ruby-actionmailer/ruby-actionmailer-vendor.patch:1.1
--- /dev/null	Tue Mar  2 23:19:04 2010
+++ packages/ruby-actionmailer/ruby-actionmailer-vendor.patch	Tue Mar  2 23:18:59 2010
@@ -0,0 +1,17 @@
+--- ruby-actionmailer-2.3.5/lib/action_mailer.rb~	2010-01-09 03:59:05.000000000 +0100
++++ ruby-actionmailer-2.3.5/lib/action_mailer.rb	2010-03-02 23:16:52.083410404 +0100
+@@ -50,7 +50,7 @@
+ end
+ 
+ module Text
+-  autoload :Format, 'action_mailer/vendor/text_format'
++  autoload :Format, 'text_format'
+ end
+ 
+ module Net
+@@ -59,4 +59,4 @@
+ 
+ autoload :MailHelper, 'action_mailer/mail_helper'
+ 
+-require 'action_mailer/vendor/tmail'
++require 'tmail'
================================================================

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