diff --git a/qwt-5.2.2-install_qt.patch b/qwt-5.2.2-install_qt.patch index 8a6b4cb..057f5ca 100644 --- a/qwt-5.2.2-install_qt.patch +++ b/qwt-5.2.2-install_qt.patch @@ -1,6 +1,6 @@ diff -up qwt-5.2.2/qwtconfig.pri.install_qt qwt-5.2.2/qwtconfig.pri --- qwt-5.2.2/qwtconfig.pri.install_qt 2011-08-01 04:28:22.000000000 -0500 -+++ qwt-5.2.2/qwtconfig.pri 2011-08-07 00:09:18.834387446 -0500 ++++ qwt-5.2.2/qwtconfig.pri 2012-08-02 16:00:01.716286604 -0500 @@ -7,10 +7,14 @@ VER_MIN = 2 VER_PAT = 2 VERSION = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT} @@ -27,10 +27,21 @@ diff -up qwt-5.2.2/qwtconfig.pri.install_qt qwt-5.2.2/qwtconfig.pri # qmake internal options diff -up qwt-5.2.2/src/src.pro.install_qt qwt-5.2.2/src/src.pro --- qwt-5.2.2/src/src.pro.install_qt 2011-08-01 04:28:22.000000000 -0500 -+++ qwt-5.2.2/src/src.pro 2011-08-07 00:07:04.920061606 -0500 -@@ -220,9 +220,17 @@ contains(CONFIG, QwtWidgets) { ++++ qwt-5.2.2/src/src.pro 2012-08-02 16:00:59.965558386 -0500 +@@ -219,10 +219,28 @@ contains(CONFIG, QwtWidgets) { + # Install directives ++# pkgconfig support ++#target.path = $$[QT_INSTALL_LIBS] ++CONFIG += create_pc create_prl no_install_prl ++QMAKE_PKGCONFIG_NAME = qwt5 ++QMAKE_PKGCONFIG_DESCRIPTION = Qt Widgets for Technical Applications ++QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS] ++QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS]/qwt ++QMAKE_PKGCONFIG_CFLAGS = -I$$[QT_INSTALL_HEADERS] ++QMAKE_PKGCONFIG_DESTDIR = pkgconfig ++ headers.files = $$HEADERS -doc.files = $${QWT_ROOT}/doc/html $${QWT_ROOT}/doc/qwt-5.2.0.qch -unix { diff --git a/qwt.spec b/qwt.spec index 812fa25..0cc5bab 100644 --- a/qwt.spec +++ b/qwt.spec @@ -2,7 +2,7 @@ Name: qwt Summary: Qt Widgets for Technical Applications Version: 5.2.2 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2 with exceptions URL: http://qwt.sourceforge.net @@ -71,6 +71,10 @@ make install INSTALL_ROOT=$RPM_BUILD_ROOT mv $RPM_BUILD_ROOT%{_qt4_docdir}/html/html \ $RPM_BUILD_ROOT%{_qt4_docdir}/html/qwt +# hack +mv $RPM_BUILD_ROOT%{_qt4_libdir}/pkgconfig/qwt.pc \ + $RPM_BUILD_ROOT%{_qt4_libdir}/pkgconfig/qwt5.pc + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -92,6 +96,7 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/* %{_qt4_headerdir}/qwt/ %{_qt4_libdir}/libqwt.so +%{_qt4_libdir}/pkgconfig/qwt5.pc %{?_qt4_plugindir}/designer/libqwt_designer_plugin.so %files doc @@ -103,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Aug 02 2012 Rex Dieter 5.2.2-5 +- pkgconfig support + * Tue Jul 31 2012 Rex Dieter - 5.2.2-4 - Provides: qwt5-qt4(-devel) - pkgconfig-style deps