Author: baggins Date: Tue Mar 2 11:23:53 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 4
- removed pointless macro abuse
- added rdoc and ri packages
---- Files affected:
packages/ruby-mongrel:
ruby-mongrel.spec (1.21 -> 1.22)
---- Diffs:
================================================================
Index: packages/ruby-mongrel/ruby-mongrel.spec
diff -u packages/ruby-mongrel/ruby-mongrel.spec:1.21
packages/ruby-mongrel/ruby-mongrel.spec:1.22
--- packages/ruby-mongrel/ruby-mongrel.spec:1.21 Sat Aug 8 20:28:18 2009
+++ packages/ruby-mongrel/ruby-mongrel.spec Tue Mar 2 12:23:47 2010
@@ -1,14 +1,16 @@
# $Revision$, $Date$
+%define pkgname mongrel
Summary: Ruby webserver toolkit
Summary(pl.UTF-8): Toolkit języka Ruby dla serwera WWW
-Name: ruby-mongrel
+Name: ruby-%{pkgname}
Version: 1.1.5
-Release: 3
+Release: 4
License: Ruby
Group: Development/Libraries
-Source0: http://gems.rubyforge.org/gems/mongrel-%{version}.gem
+Source0: http://gems.rubyforge.org/gems/%{pkgname}-%{version}.gem
# Source0-md5: a37617eb48f0932cc32143b2d76c0d12
Patch0: %{name}-nogems.patch
+Patch1: %{name}-ruby1.9.patch
URL: http://mongrel.rubyforge.org/
BuildRequires: dos2unix
BuildRequires: rpmbuild(macros) >= 1.277
@@ -17,54 +19,78 @@
%{?ruby_mod_ver_requires_eq}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-# passing CFLAGS breaks -fPIC parsing, patch mkmf module to be able to pass CC
and OPTFLAgs
-
-%define ruby_config {\
- %{__ruby} setup.rb config \
- --prefix=%{_prefix} \
- --bindir=%{_bindir} \
- --libdir=%{_libdir} \
- --datadir=%{_datadir} \
- --mandir=%{_mandir} \
- --sysconfdir=%{_sysconfdir} \
- --localstatedir=%{_localstatedir} \
- --rbdir=%{ruby_rubylibdir} \
- --sodir=%{ruby_archdir} \
- --make-prog="%{__make} CC=\"%{__cc}\"" \
-}
-
-%define ruby_setup { \
- %{__ruby} setup.rb setup \
-}
-
-%define ruby_install { \
- %{__ruby} setup.rb install \
-}
-
%description
Ruby webserver toolkit.
%description -l pl.UTF-8
Toolkit języka Ruby dla serwera WWW.
+%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
+
+%description ri
+ri documentation for %{pkgname}.
+
+%description ri -l pl.UTF-8
+Dokumentacji w formacie ri dla %{pkgname}.
+
%prep
-%setup -q -c -T
-tar xf %{SOURCE0} -O data.tar.gz | tar xz
+%setup -q -c
+%{__tar} xf %{SOURCE0} -O data.tar.gz | %{__tar} xz
+find -newer README -o -print | xargs touch --reference %{SOURCE0}
dos2unix examples/mongrel_simple_service.rb
%patch0 -p1
+%patch1 -p1
find -name '*.rb' -print0 | xargs -0 %{__sed} -i -e 's,\r$,,'
%build
-%ruby_config
-%ruby_setup
+# passing CFLAGS breaks -fPIC parsing,
+# patch mkmf module to be able to pass CC and OPTFLAGS
+%{__ruby} setup.rb config \
+ --prefix=%{_prefix} \
+ --bindir=%{_bindir} \
+ --libdir=%{_libdir} \
+ --datadir=%{_datadir} \
+ --mandir=%{_mandir} \
+ --sysconfdir=%{_sysconfdir} \
+ --localstatedir=%{_localstatedir} \
+ --rbdir=%{ruby_rubylibdir} \
+ --sodir=%{ruby_archdir} \
+ --make-prog="%{__make} CC=\"%{__cc}\""
+
+%{__ruby} setup.rb setup
+
+rdoc --ri --op ri lib
+rdoc --op rdoc lib
+rm -r ri/{IO,Kernel,RequestLog,TCPServer}
+rm ri/created.rid
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{ruby_rubylibdir}
-%ruby_install \
+install -d $RPM_BUILD_ROOT{%{ruby_rubylibdir},%{ruby_ridir},%{ruby_rdocdir}}
+
+%{__ruby} setup.rb install \
--prefix=$RPM_BUILD_ROOT
+cp -a ri/* $RPM_BUILD_ROOT%{ruby_ridir}
+cp -a rdoc $RPM_BUILD_ROOT%{ruby_rdocdir}/%{name}-%{version}
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -75,12 +101,25 @@
%{ruby_rubylibdir}/mongrel
%attr(755,root,root) %{ruby_archdir}/*.so
+%files rdoc
+%defattr(644,root,root,755)
+%{ruby_rdocdir}/%{name}-%{version}
+
+%files ri
+%defattr(644,root,root,755)
+%{ruby_ridir}/Mongrel*
+
%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.22 2010/03/02 11:23:47 baggins
+- rel 4
+- removed pointless macro abuse
+- added rdoc and ri packages
+
Revision 1.21 2009/08/08 18:28:18 hawk
- BR: dos2unix to workaround CVS stupidity
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ruby-mongrel/ruby-mongrel.spec?r1=1.21&r2=1.22&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
