Author: baggins Date: Tue Mar 2 21:56:32 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- added rdoc and ri packages
- simplified build
---- Files affected:
packages/ruby-rack:
ruby-rack.spec (1.5 -> 1.6)
---- Diffs:
================================================================
Index: packages/ruby-rack/ruby-rack.spec
diff -u packages/ruby-rack/ruby-rack.spec:1.5
packages/ruby-rack/ruby-rack.spec:1.6
--- packages/ruby-rack/ruby-rack.spec:1.5 Mon Mar 1 01:39:59 2010
+++ packages/ruby-rack/ruby-rack.spec Tue Mar 2 22:56:27 2010
@@ -1,19 +1,20 @@
# $Revision$, $Date$
+%define pkgname rack
Summary: Modular interface to webservers
Summary(pl.UTF-8): Modularny interfejs do serwerów WWW
-Name: ruby-rack
+Name: ruby-%{pkgname}
Version: 1.1.0
Release: 1
License: MIT
Group: Development/Libraries
-Source0: http://chneukirchen.org/releases/rack-%{version}.tar.gz
+Source0: http://chneukirchen.org/releases/%{pkgname}-%{version}.tar.gz
# Source0-md5: 4e51024e1a449ae120af75f0a7cffb65
URL: http://rubyforge.org/projects/rack
-BuildRequires: rpmbuild(macros) >= 1.277
+BuildRequires: rpmbuild(macros) >= 1.484
+BuildRequires: ruby >= 1:1.8.6
BuildRequires: ruby-modules
-BuildRequires: setup.rb
-#BuildArch: noarch
%{?ruby_mod_ver_requires_eq}
+#BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -31,42 +32,78 @@
oprogramowania znajdującego się między nimi (tzw. middleware) w
jedno wywołanie metody.
-%prep
-%setup -q -n rack-%{version}
+%package rdoc
+Summary: HTML documentation for %{pkgname}
+Summary(pl.UTF-8): Dokumentacja w formacie HTML dla %{pkgname}
+Group: Documentation
+Requires: ruby >= 1:1.8.7-4
+
+%description rdoc
+HTML documentation for %{pkgname}.
+
+%description rdoc -l pl.UTF-8
+Dokumentacja w formacie HTML dla %{pkgname}.
+
+%package ri
+Summary: ri documentation for %{pkgname}
+Summary(pl.UTF-8): Dokumentacja w formacie ri dla %{pkgname}
+Group: Documentation
+Requires: ruby
-%build
-cp %{_datadir}/setup.rb .
-ruby setup.rb config \
- --rbdir=%{ruby_rubylibdir} \
- --sodir=%{ruby_archdir}
+%description ri
+ri documentation for %{pkgname}.
-ruby setup.rb setup
+%description ri -l pl.UTF-8
+Dokumentacji w formacie ri dla %{pkgname}.
-rdoc -o rdoc lib SPEC
+%prep
+%setup -q -n %{pkgname}-%{version}
+
+%{__sed} -i -e 's|/usr/bin/env ruby|%{__ruby}|' bin/rackup
+
+%build
+rdoc --ri --op ri lib
+rdoc --op rdoc lib
+rm -r ri/{Context,FCGI,HeaderHash,Multipart}
+rm ri/created.rid
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{ruby_rubylibdir}
+install -d
$RPM_BUILD_ROOT{%{_bindir},%{ruby_rubylibdir},%{ruby_ridir},%{ruby_rdocdir}}
-ruby setup.rb install \
- --prefix=$RPM_BUILD_ROOT
+cp -a bin/* $RPM_BUILD_ROOT%{_bindir}
+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}
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc rdoc README ChangeLog example/*
+%doc README ChangeLog example/*
%attr(755,root,root) %{_bindir}/*
%{ruby_rubylibdir}/rack
%{ruby_rubylibdir}/rack.rb
+%files rdoc
+%defattr(644,root,root,755)
+%{ruby_rdocdir}/%{name}-%{version}
+
+%files ri
+%defattr(644,root,root,755)
+%{ruby_ridir}/Rack
+
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <[email protected]>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.6 2010/03/02 21:56:27 baggins
+- added rdoc and ri packages
+- simplified build
+
Revision 1.5 2010/03/01 00:39:59 baggins
- up to 1.1.0
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ruby-rack/ruby-rack.spec?r1=1.5&r2=1.6&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
