rpms
/
qt-mobility
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add pkgconfig support

This commit is contained in:
Rex Dieter 2011-10-29 11:57:35 -05:00
parent 918e7b58f4
commit cd3eebf9ec
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qt-mobility-opensource-src-1.2.0-pkgconfig.patch Normal file
View File

@ -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

9
qt-mobility.spec
View File

@ -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@fedoraproject.org> 1.2.0-6.20110922
- add pkgconfig support
* Thu Sep 22 2011 Rex Dieter <rdieter@fedoraproject.org> 1.2.0-5.20110922
- 20110922 snapshot
- use pkgconfig-style deps