Author: glen Date: Sat May 3 17:10:23 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- CC/CFLAGS
---- Files affected:
SPECS:
ruby-mongrel.spec (1.14 -> 1.15)
---- Diffs:
================================================================
Index: SPECS/ruby-mongrel.spec
diff -u SPECS/ruby-mongrel.spec:1.14 SPECS/ruby-mongrel.spec:1.15
--- SPECS/ruby-mongrel.spec:1.14 Thu Dec 13 00:01:01 2007
+++ SPECS/ruby-mongrel.spec Sat May 3 19:10:18 2008
@@ -16,6 +16,28 @@
%{?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.
@@ -24,18 +46,20 @@
%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
@@ -53,6 +77,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.15 2008-05-03 17:10:18 glen
+- CC/CFLAGS
+
Revision 1.14 2007-12-12 23:01:01 aredridel
- 1.1.1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ruby-mongrel.spec?r1=1.14&r2=1.15&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
