[qwt] qwt*.pc : +Requires: QtGui QtSvg

Rex Dieter rdieter at fedoraproject.org
Fri Aug 3 14:00:47 UTC 2012


commit f564df3bae3d150de4d7e3de9a3c51e0f771adf0
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Aug 3 09:04:26 2012 -0500

    qwt*.pc : +Requires: QtGui QtSvg

 qwt-5.2.2-install_qt.patch |    7 ++++---
 qwt.spec                   |    6 ++++--
 2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/qwt-5.2.2-install_qt.patch b/qwt-5.2.2-install_qt.patch
index 825ae24..df95de1 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	2012-08-02 16:00:01.716286604 -0500
++++ qwt-5.2.2/qwtconfig.pri	2012-08-03 09:02:20.518891316 -0500
 @@ -7,10 +7,14 @@ VER_MIN      = 2
  VER_PAT      = 2
  VERSION      = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
@@ -27,8 +27,8 @@ 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	2012-08-02 16:00:59.965558386 -0500
-@@ -219,10 +219,28 @@ contains(CONFIG, QwtWidgets) {
++++ qwt-5.2.2/src/src.pro	2012-08-03 09:02:41.250632133 -0500
+@@ -219,10 +219,29 @@ contains(CONFIG, QwtWidgets) {
  
  # Install directives
  
@@ -40,6 +40,7 @@ diff -up qwt-5.2.2/src/src.pro.install_qt qwt-5.2.2/src/src.pro
 +QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS]
 +QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS]/qwt
 +QMAKE_PKGCONFIG_CFLAGS = -I$$[QT_INSTALL_HEADERS]
++QMAKE_PKGCONFIG_REQUIRES = QtGui QtSvg
 +QMAKE_PKGCONFIG_DESTDIR = pkgconfig
 +
  headers.files  = $$HEADERS
diff --git a/qwt.spec b/qwt.spec
index 1893790..8bd7188 100644
--- a/qwt.spec
+++ b/qwt.spec
@@ -2,7 +2,7 @@
 Name:	 qwt
 Summary: Qt Widgets for Technical Applications
 Version: 5.2.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: LGPLv2 with exceptions
 URL:     http://qwt.sourceforge.net
@@ -35,7 +35,6 @@ Group:    Development/Libraries
 Provides: qwt5-qt4-devel = %{version}-%{release}
 Provides: qwt5-qt4-devel%{_isa} = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: pkgconfig(QtGui) pkgconfig(QtSvg) 
 %description devel
 %{summary}.
 
@@ -108,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 03 2012 Rex Dieter <rdieter at fedoraproject.org> 5.2.2-6
+- qwt*.pc : +Requires: QtGui QtSvg
+
 * Thu Aug 02 2012 Rex Dieter <rdieter at fedoraproject.org> 5.2.2-5
 - pkgconfig support
 


More information about the scm-commits mailing list