[qt-mobility] add pkgconfig support

Rex Dieter rdieter at fedoraproject.org
Sat Oct 29 16:50:10 UTC 2011


commit cd3eebf9ec93b03240c7dfc6477629f175cef551
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Oct 29 11:57:35 2011 -0500

    add pkgconfig support

 qt-mobility-opensource-src-1.2.0-pkgconfig.patch |   13 +++++++++++++
 qt-mobility.spec                                 |    9 ++++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/qt-mobility-opensource-src-1.2.0-pkgconfig.patch b/qt-mobility-opensource-src-1.2.0-pkgconfig.patch
new file mode 100644
index 0000000..e54011b
--- /dev/null
+++ b/qt-mobility-opensource-src-1.2.0-pkgconfig.patch
@@ -0,0 +1,13 @@
+diff -up qt-mobility-opensource-src-1.2.0/features/deploy.pri.pkgconfig qt-mobility-opensource-src-1.2.0/features/deploy.pri
+--- qt-mobility-opensource-src-1.2.0/features/deploy.pri.pkgconfig	2011-09-22 01:59:10.000000000 -0500
++++ qt-mobility-opensource-src-1.2.0/features/deploy.pri	2011-10-29 11:43:52.340550783 -0500
+@@ -4,7 +4,7 @@ headers.path = $$QT_MOBILITY_INCLUDE/$$T
+ contains(TEMPLATE,.*lib) {
+     target.path=$$QT_MOBILITY_LIB
+ 
+-    maemo5|maemo6|meego {
++    linux-*|maemo5|maemo6|meego {
+         CONFIG += create_pc create_prl
+         QMAKE_PKGCONFIG_NAME = lib$$TARGET
+         QMAKE_PKGCONFIG_DESTDIR = pkgconfig
+diff -up qt-mobility-opensource-src-1.2.0/src/location/location.pro.pkgconfig qt-mobility-opensource-src-1.2.0/src/location/location.pro
diff --git a/qt-mobility.spec b/qt-mobility.spec
index cb0911d..006e674 100644
--- a/qt-mobility.spec
+++ b/qt-mobility.spec
@@ -6,7 +6,7 @@
 
 Name:    qt-mobility
 Version: 1.2.0
-Release: 5.%{snap}%{?dist}
+Release: 6.%{snap}%{?dist}
 Summary: Qt Mobility Framework
 Group:   System Environment/Libraries
 License: LGPLv2 with exceptions
@@ -25,6 +25,8 @@ Provides: qt4-mobility%{?_isa} = %{version}-%{release}
 
 ## upstreamable patches
 Patch50: qt-mobility-opensource-src-1.2.0-translationsdir.patch
+# add pkgconfig for linux-* platforms too
+Patch51: qt-mobility-opensource-src-1.2.0-pkgconfig.patch
 
 ## upstream patches
 # double-check if this is still required -- Rex
@@ -95,6 +97,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %setup -q -n %{name}-opensource-src-%{version}
 
 %patch50 -p1 -b .translationsdir
+%patch51 -p1 -b .pkgconfig
 %patch101 -p1 -b .pulseaudio_lib
 
 
@@ -179,6 +182,7 @@ rm -rf %{buildroot}
 %{_qt4_headerdir}/Qt*/
 %{_qt4_libdir}/libQt*.prl
 %{_qt4_libdir}/libQt*.so
+%{_qt4_libdir}/pkgconfig/Qt*.pc
 
 %files doc
 %defattr(-,root,root,-)
@@ -234,6 +238,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Oct 29 2011 Rex Dieter <rdieter at fedoraproject.org> 1.2.0-6.20110922
+- add pkgconfig support
+
 * Thu Sep 22 2011 Rex Dieter <rdieter at fedoraproject.org> 1.2.0-5.20110922
 - 20110922 snapshot
 - use pkgconfig-style deps


More information about the scm-commits mailing list