recent changes

diff --git a/ruby.spec b/ruby.spec
index 34e2b61ec02280c599b8b4552f8884ea3c1bcbb8..9b2f40096d123f5cf532456e192cada3c41639c0 100644 (file)
--- a/ruby.spec
+++ b/ruby.spec
@@ -16,16 +16,16 @@ Source0:    http://rubygems.org/downloads/%{pkgname}-%{version}.gem
 # Source0-md5: -
 Group:         Development/Languages
 URL:           http://rubyforge.org/projects/.../
-BuildRequires: rpmbuild(macros) >= 1.665
 BuildRequires: rpm-rubyprov
-BuildRequires: setup.rb
-%{?ruby_mod_ver_requires_eq}
+BuildRequires: rpmbuild(macros) >= 1.665
+#BuildRequires:        setup.rb
+# optional locale BR, see ri/rdoc building below
+#%if %(locale -a | grep -q '^en_US$'; echo $?)
+#BuildRequires:        glibc-localedb-all
+#%endif
 #BuildArch:    noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# nothing to be placed there. we're not noarch only because of ruby packaging
-%define                _enable_debug_packages  0
-
 %description
 ...
 
@@ -54,19 +54,14 @@ ri documentation for %{pkgname}.
 Dokumentacji w formacie ri dla %{pkgname}.
 
 %prep
+# gem
+%setup -q -n %{pkgname}-%{version}
 # tgz
 #%setup -q -n %{pkgname}-%{version}
 
 # ext build
 cp -p %{_datadir}/setup.rb .
 
-# gem install
-%setup -qc
-
-# gem install
-%{__tar} xf %{SOURCE0} -O data.tar.gz | %{__tar} xz
-find -newer README -o -print | xargs touch --reference %{SOURCE0}
-
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
@@ -105,6 +100,7 @@ ruby setup.rb setup
 %endif
 
 # binary pkgs:
+cd ext/%{pkgname}
 %{__ruby} extconf.rb
 %{__make} \
        CC="%{__cc}" \
@@ -112,6 +108,10 @@ ruby setup.rb setup
        CFLAGS="%{rpmcflags} -fPIC"
 
 # with rdoc/ri:
+# optional locale force, see BR above as well
+# UTF8 locale needed for doc generation
+#export LC_ALL=en_US.UTF-8
+
 rdoc --ri --op ri lib
 rdoc --op rdoc lib
 # rm -r ri/NOT_THIS_MODULE_RELATED_DIRS
@@ -119,8 +119,8 @@ rm ri/created.rid
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{ruby_rubylibdir},%{ruby_ridir},%{ruby_rdocdir}}
-install -d $RPM_BUILD_ROOT{%{ruby_rubylibdir},%{ruby_ridir},%{ruby_rdocdir},%{_bindir}}
+install -d $RPM_BUILD_ROOT{%{ruby_vendorlibdir},%{ruby_ridir},%{ruby_rdocdir}}
+install -d $RPM_BUILD_ROOT{%{ruby_vendorlibdir},%{ruby_ridir},%{ruby_rdocdir},%{_bindir}}
 %{__ruby} setup.rb install \
        --prefix=$RPM_BUILD_ROOT
 
@@ -128,7 +128,7 @@ install -d $RPM_BUILD_ROOT%{ruby_vendorlibdir}
 cp -a lib/* $RPM_BUILD_ROOT%{ruby_vendorlibdir}
 
 cp -a bin/* $RPM_BUILD_ROOT%{_bindir}
-cp -a lib/* $RPM_BUILD_ROOT%{ruby_rubylibdir}
+cp -a lib/* $RPM_BUILD_ROOT%{ruby_vendorlibdir}
 
 cp -a ri/* $RPM_BUILD_ROOT%{ruby_ridir}
 
@@ -149,9 +149,9 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc CHANGELOG README
-%{ruby_rubylibdir}/%{pkgname}.rb
-%{ruby_rubylibdir}/%{pkgname}
-%attr(755,root,root) %{ruby_archdir}/%{pkgname}_ext.so
+%{ruby_vendorlibdir}/%{pkgname}.rb
+%{ruby_vendorlibdir}/%{pkgname}
+%attr(755,root,root) %{ruby_vendorarchdir}/%{pkgname}_ext.so
 %{ruby_specdir}/%{pkgname}-%{version}.gemspec
 
 %files rdoc