- up to 1.8.2

Changed files:
    amrita.spec -> 1.2

diff --git a/amrita.spec b/amrita.spec
index bc91d96dd6ff5f205956ccd558cacb21602c728e..5818e9d5c4011e58480837febc9d9922c0889662 100644 (file)
--- a/amrita.spec
+++ b/amrita.spec
@@ -1,14 +1,14 @@
+%define ruby_archdir    %(ruby -r rbconfig -e 'print Config::CONFIG["archdir"]')
 %define ruby_rubylibdir %(ruby -r rbconfig -e 'print Config::CONFIG["rubylibdir"]')
 Summary:       An HTML/XHTML template library for Ruby
 Name:          amrita
-Version:       1.0.2
+Version:       1.8.2
 Release:       1
 License:       GPL
 URL:           http://www.brain-tokyo.jp/research/amrita/
 Group:         Development/Libraries
 Source0:       http://www.brain-tokyo.jp/research/amrita/%{name}-%{version}.tar.gz
-# Source0-md5: 903af244f72d1a4b83f2cb8cfeecbac7
-BuildArchitectures:    noarch
+# Source0-md5: 36dd153cef9481d853d09094b8daece7
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -18,34 +18,23 @@ An HTML/XHTML template library for Ruby
 %setup -q
 
 %build
+ruby install.rb config --site-ruby=%{ruby_rubylibdir} --so-dir=%{ruby_archdir}
+ruby install.rb setup
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-       PREFIX=$RPM_BUILD_ROOT%{_prefix} SITE_DIR=$RPM_BUILD_ROOT%{ruby_rubylibdir}
-
+ruby install.rb install --prefix=$RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-
-%{ruby_rubylibdir}/amrita/compiler.rb
-%{ruby_rubylibdir}/amrita/format.rb
-%{ruby_rubylibdir}/amrita/tag.rb
-%{ruby_rubylibdir}/amrita/parser.rb
-%{ruby_rubylibdir}/amrita/node_expand.rb
-%{ruby_rubylibdir}/amrita/node.rb
-%{ruby_rubylibdir}/amrita/template.rb
-%{ruby_rubylibdir}/amrita/ams.rb
-%{ruby_rubylibdir}/amrita/xml.rb
-%{ruby_rubylibdir}/amrita/amx.rb
-%{ruby_rubylibdir}/amrita/handlers.rb
-%{ruby_rubylibdir}/amrita/cgikit.rb
-%{ruby_rubylibdir}/amrita/merge.rb
-%{ruby_rubylibdir}/amrita/parts.rb
 %attr(755,root,root) %{_bindir}/ams
 %attr(755,root,root) %{_bindir}/amx
 %attr(755,root,root) %{_bindir}/amshandler
+%dir %{ruby_rubylibdir}/amrita
+%{ruby_rubylibdir}/amrita/*.rb
+%attr(755,root,root) %{ruby_archdir}/amrita_accel.so
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT