From b48f65c74bf8b8f73c7417bab477dc160e07b73f Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Oct 19 2012 16:19:28 +0000 Subject: fix/rebuild for qwt5-qt4 compat pkg --- diff --git a/PyQwt.spec b/PyQwt.spec index 3d6f32f..fdfe8b1 100644 --- a/PyQwt.spec +++ b/PyQwt.spec @@ -1,6 +1,13 @@ + +%if 0%{?fedora} > 17 +%global qwt_dep pkgconfig(qwt5-qt4) +%else +%global qwt_dep qwt-devel +%endif + Name: PyQwt Version: 5.2.0 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Python bindings for Qwt Group: Development/Languages @@ -13,7 +20,7 @@ BuildRequires: python2-devel BuildRequires: sip-devel BuildRequires: PyQt4-devel BuildRequires: numpy-f2py -BuildRequires: qwt-devel +BuildRequires: %{qwt_dep} Requires: PyQt4%{?_isa} Requires: numpy%{?_isa} @@ -37,7 +44,7 @@ Summary: Files needed to build other bindings on PyQwt Group: Development/Languages Requires: %{name}%{?_isa} = %{version}-%{release} Requires: PyQt4-devel%{?_isa} -Requires: qwt-devel%{?_isa} +Requires: %{qwt_dep} %description devel Files needed to build other bindings for Qwt C++ classes that inherit from any of the PyQwt classes. @@ -51,9 +58,10 @@ find qt4examples/ -name "*.py" | xargs chmod a-x %build -QWTDIR=%{_includedir}/qwt +QWTINC="%(pkg-config --cflags-only-I qwt5-qt4 2>/dev/null || echo "%{_includedir}/qwt")" +QWTLIB="%(pkg-config --libs qwt5-qt4 2>/dev/null || echo "-lqwt")" pushd configure -%{__python} configure.py -I$QWTDIR -lqwt --disable-numarray --disable-numeric +%{__python} configure.py $QWTINC $QWTLIB --disable-numarray --disable-numeric popd make %{?_smp_mflags} -C configure @@ -86,6 +94,9 @@ chmod 755 %{buildroot}/%{python_sitearch}/PyQt4/Qwt5/qplt.py %changelog +* Fri Oct 19 2012 Rex Dieter 5.2.0-19 +- fix/rebuild for qwt5-qt4 compat pkg + * Wed Oct 03 2012 Rex Dieter 5.2.0-18 - rebuild (sip)