[qwt] fix remnants of epel5mode macro
Rex Dieter
rdieter at fedoraproject.org
Thu Jul 14 13:43:03 UTC 2011
commit a6122cc9d9d1cc8b38cc3fb5433e6d89a6430c41
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Thu Jul 14 07:43:08 2011 -0500
fix remnants of epel5mode macro
qwt.spec | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/qwt.spec b/qwt.spec
index a086acb..90cf29a 100644
--- a/qwt.spec
+++ b/qwt.spec
@@ -41,12 +41,8 @@ sed -i "s\QTDESIGNERPATH\ $RPM_BUILD_ROOT%{_libdir}/qt4/plugins/designer\1" desi
%build
-%if %{epel5mode}
-%{_libdir}/qt4/bin/qmake
-%else
-qmake-qt4
-%endif
-#parallel build fails sometime so I disable it
+%{?_qt4_qmake}%{!?_qt4_qmake:%{_libdir}/qt4/bin/qmake}
+
make
@@ -74,10 +70,9 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(-,root,root,-)
-%{_includedir}/%{name}
+%{_includedir}/qwt/
%{_libdir}/libqwt.so
-#%{_qt4_plugindir}/designer/libqwt_designer_plugin.so
-%{_libdir}/qt4/plugins/designer/libqwt_designer_plugin.so
+%{?_qt4_plugindir}%{!?_qt4_plugindir:%{_libdir}/qt4/plugins}/designer/libqwt_designer_plugin.so
%changelog
More information about the scm-commits
mailing list