[ruby-qt] 4.9.0-2
Rex Dieter
rdieter at fedoraproject.org
Thu Aug 2 20:09:19 UTC 2012
commit f1737eee1e9656e8bbba4361d3ed2dd99d378092
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Thu Aug 2 15:12:57 2012 -0500
4.9.0-2
- cleaner ruby macro usage wrt vendor/site dirs
- s/qwt-devel/qwt5-qt4/
ruby-qt.spec | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/ruby-qt.spec b/ruby-qt.spec
index 6d76804..8c406a4 100644
--- a/ruby-qt.spec
+++ b/ruby-qt.spec
@@ -9,7 +9,7 @@
Summary: Ruby bindings for Qt 4
Name: ruby-qt
Version: 4.9.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+
Group: Development/Languages
@@ -29,7 +29,7 @@ BuildRequires: pkgconfig(QtCore) pkgconfig(QtScript) pkgconfig(QtTest) pkgconfig
BuildRequires: pkgconfig(QtWebKit)
BuildRequires: ruby-devel ruby
BuildRequires: qscintilla-devel
-BuildRequires: qwt-devel
+BuildRequires: qwt5-qt4-devel
BuildRequires: smokeqt-devel >= %{version}
Obsoletes: QtRuby < 4.7.0
@@ -73,12 +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} -DRUBY_VENDORARCH_DIR=%{ruby_vendorarchdir} -DRUBY_VENDORLIB_DIR=%{ruby_vendorlibdir} ..
+%{cmake_kde4} \
+ -DCUSTOM_RUBY_SITE_ARCH_DIR:PATH=%{ruby_vendorarchdir} \
+ -DCUSTOM_RUBY_SITE_LIB_DIR:PATH=%{ruby_vendorlibdir} \
+ ..
popd
make %{?_smp_mflags} -C %{_target_platform}
@@ -128,6 +128,10 @@ rm -rf %{buildroot}
%changelog
+* Thu Aug 02 2012 Rex Dieter <rdieter at fedoraproject.org> - 4.9.0-2
+- cleaner ruby macro usage wrt vendor/site dirs
+- s/qwt-devel/qwt5-qt4/
+
* Thu Jul 26 2012 Lukas Tinkl <ltinkl at redhat.com> - 4.9.0-1
- 4.9.0
More information about the scm-commits
mailing list