- CC/CFLAGS

Changed files:
    ruby-mongrel.spec -> 1.15

diff --git a/ruby-mongrel.spec b/ruby-mongrel.spec
index 863275adfed5e74223736a40feb14c7bf01d66ca..4663697dde78990afa46954d65ab5bb0f4d28cfc 100644 (file)
--- a/ruby-mongrel.spec
+++ b/ruby-mongrel.spec
@@ -15,6 +15,28 @@ BuildRequires:       ruby-modules
 %{?ruby_mod_ver_requires_eq}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%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}\" CFLAGS=\"%{rpmcflags}\"" \
+}
+
+%define        ruby_setup { \
+       %{__ruby} setup.rb setup \
+}
+
+%define ruby_install { \
+       %{__ruby} setup.rb install \
+}
+
 %description
 Ruby webserver toolkit.
 
@@ -23,18 +45,20 @@ Toolkit języka Ruby dla serwera WWW.
 
 %prep
 %setup -q -c -T
-tar xf %{SOURCE0} -O data.tar.gz | tar xzv-
+tar xf %{SOURCE0} -O data.tar.gz | tar xz
 %patch0 -p1
 
+find -name '*.rb' -print0 | xargs -0 %{__sed} -i -e 's,\r$,,'
+
 %build
-ruby setup.rb config --rbdir=%{ruby_rubylibdir} --sodir=%{ruby_archdir}
-ruby setup.rb setup
+%ruby_config
+%ruby_setup
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{ruby_rubylibdir}
-
-ruby setup.rb install --prefix=$RPM_BUILD_ROOT
+%ruby_install \
+       --prefix=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT