diff --git a/ruby-qt.spec b/ruby-qt.spec index 08bb555..580bd87 100644 --- a/ruby-qt.spec +++ b/ruby-qt.spec @@ -1,15 +1,15 @@ -%global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]') -%global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]') %if 0%{?fedora} > 16 %global ruby_abi 1.9.1 %else %global ruby_abi 1.8 +%global ruby_vendorlibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]') +%global ruby_vendorarchdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]') %endif Summary: Ruby bindings for Qt 4 Name: ruby-qt Version: 4.8.0 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: Development/Languages @@ -73,9 +73,12 @@ Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %build +# just a cosmetic change for cmake defs +sed -i -e 's|SITEARCH|VENDORARCH|' -e 's|SITELIB|VENDORLIB|' CMakeLists.txt + mkdir -p %{_target_platform} pushd %{_target_platform} -%{cmake_kde4} .. +%{cmake_kde4} -DRUBY_VENDORARCH_DIR=%{ruby_vendorarchdir} -DRUBY_VENDORLIB_DIR=%{ruby_vendorlibdir} .. popd make %{?_smp_mflags} -C %{_target_platform} @@ -97,17 +100,17 @@ rm -rf %{buildroot} %defattr(-, root, root, 0755) %doc AUTHORS COPYING COPYING.LIB ChangeLog INSTALL README %{_libdir}/libqtruby4shared.so.2* -%{ruby_sitearch}/*.so -%{ruby_sitelib}/phonon/ -%{ruby_sitelib}/qscintilla/ -%{ruby_sitelib}/qtdeclarative/ -%{ruby_sitelib}/qwt/ -%{ruby_sitelib}/Qt/ -%{ruby_sitelib}/Qt*.rb -%{ruby_sitelib}/qtscript/ -%{ruby_sitelib}/qttest/ -%{ruby_sitelib}/qtuitools/ -%{ruby_sitelib}/qtwebkit/ +%{ruby_vendorarchdir}/*.so +%{ruby_vendorlibdir}/phonon/ +%{ruby_vendorlibdir}/qscintilla/ +%{ruby_vendorlibdir}/qtdeclarative/ +%{ruby_vendorlibdir}/qwt/ +%{ruby_vendorlibdir}/Qt/ +%{ruby_vendorlibdir}/Qt*.rb +%{ruby_vendorlibdir}/qtscript/ +%{ruby_vendorlibdir}/qttest/ +%{ruby_vendorlibdir}/qtuitools/ +%{ruby_vendorlibdir}/qtwebkit/ %files devel %defattr(-, root, root, 0755) @@ -124,7 +127,10 @@ rm -rf %{buildroot} %doc examples -%changelog +%changelog +* Wed Feb 08 2012 Jaroslav Reznik 4.8.0-3 +- proper rebuild for ruby-1.9.x (use ruby macros for dirs) + * Tue Feb 07 2012 Rex Dieter 4.8.0-2 - rebuild for ruby-1.9.x (f17)