Browse Source

eruby:
- build with ruby-1.9.3
- add patches from FreeBSD/fedora to build with ruby-1.9

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7021 ec354946-7b23-47d6-9f5a-488ba84defc7

daisuke 11 years ago
parent
commit
16b9e41b97
1 changed files with 18 additions and 9 deletions
  1. 18 9
      e/eruby/eruby-vl.spec

+ 18 - 9
e/eruby/eruby-vl.spec

@@ -2,18 +2,19 @@ Summary:       An interpreter of embedded Ruby language
 Summary(ja):   テキスト埋め込みの Ruby 言語インタプリタ
 Name:          eruby
 Version:       1.0.5
-Release:       2%{?_dist_release}
+Release:       3%{?_dist_release}
 # eruby is GPLv2+
 # liberuby is LGPLv2+
 License:       GPLv2+ and LGPLv2+
 Group:         Development/Languages
 Source0:       http://www.modruby.net/archive/%{name}-%{version}.tar.gz
-Patch0:        eruby-fix-build.patch
+Patch0:        patch-aa-git
+Patch1:        eruby-fix-build.patch
+Patch2:	       eruby-1.0.5-ruby19.patch
 URL:           http://www.modruby.net/
 Prefix:        /usr
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
-BuildRequires: ruby, ruby-devel >= 1.8.0
-Requires:      libruby >= 1.8.0, liberuby = %{version}
+BuildRequires: ruby, ruby-devel >= 1.9
 
 
 %description
@@ -56,7 +57,9 @@ ERubyを組み込んだアプリケーションを作るために必要となる
 
 %prep
 %setup -q
-%patch0 -p1 -b .0-build
+%patch0 -p1 -b .git
+%patch1 -p1 -b .0-build
+%patch2 -p1 -b .ruby19
 
 %build
 ruby configure.rb --enable-shared
@@ -70,11 +73,10 @@ mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_libdir}
 mkdir -p %{buildroot}%{_mandir}/man1
 mkdir -p %{buildroot}%{_includedir}
+mkdir -p %{buildroot}%{ruby_vendorarchdir}
 
 # installing binaries ...
-make install prefix=%{buildroot}%{prefix} \
-             libdir=%{buildroot}%{_libdir} \
-             mandir=%{buildroot}%{_mandir}
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # remove the unnecessary files
 rm %{buildroot}%{_libdir}/*.a
@@ -82,6 +84,9 @@ rm %{buildroot}%{_libdir}/*.a
 # change permissions
 find %{buildroot}%{_libdir} -name '*.so*' | xargs chmod 0755
 
+# workaround for not working site-install properly
+mv $RPM_BUILD_ROOT%{ruby_libarchdir}/eruby.so $RPM_BUILD_ROOT%{ruby_vendorarchdir}/
+
 %clean
 rm -rf %{buildroot}
 
@@ -103,7 +108,7 @@ rm -rf %{buildroot}
 %files -n liberuby
 %defattr(-, root, root)
 %{_libdir}/lib%{name}.so.*
-%{rarchdir}/%{name}*
+%{ruby_vendorarchdir}/%{name}*
 
 
 %files -n liberuby-devel
@@ -113,6 +118,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 26 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 1.0.5-3
+- rebuild with ruby-1.9.3
+- add patches from FreeBSD/fedora
+
 * Thu Mar 22 2012 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 1.0.5-2
 - rebuild; spec revamp; remove *.a file