[qt-mobility] 20110922 snapshot use pkgconfig-style deps

Rex Dieter rdieter at fedoraproject.org
Thu Sep 22 14:55:44 UTC 2011


commit 918e7b58f4017c6ff88104e8cae42b8b42e2f326
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Sep 22 10:02:24 2011 -0500

    20110922 snapshot
    use pkgconfig-style deps

 .gitignore       |    1 +
 qt-mobility.spec |   38 ++++++++++++++++++++++++++------------
 sources          |    2 +-
 3 files changed, 28 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 227e708..b122d40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /qt-mobility-opensource-src-1.2.0.tar.gz
+/qt-mobility-opensource-src-1.2.0-20110922.tar.xz
diff --git a/qt-mobility.spec b/qt-mobility.spec
index 4bda9bc..cb0911d 100644
--- a/qt-mobility.spec
+++ b/qt-mobility.spec
@@ -2,14 +2,22 @@
 # options
 #define examples 1 
 
+%define snap 20110922
+
 Name:    qt-mobility
 Version: 1.2.0
-Release: 4%{?dist}
+Release: 5.%{snap}%{?dist}
 Summary: Qt Mobility Framework
 Group:   System Environment/Libraries
 License: LGPLv2 with exceptions
 URL:     http://qt.nokia.com/products/qt-addons/mobility 
+%if 0%{?snap:1}
+# git clone git://gitorious.org/qt-mobility/qt-mobility.git
+# cd qt-mobility; git archive --prefix=qt-mobility-opensource-src-1.2.0/ master | xz -9 >  qt-mobility-opensources-src-1.2.0-20110922.tar.xz
+Source0: qt-mobility-opensource-src-1.2.0-%{snap}.tar.xz
+%else
 Source0: http://get.qt.nokia.com/qt/add-ons/qt-mobility-opensource-src-%{version}.tar.gz
+%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Provides: qt4-mobility = %{version}-%{release}
@@ -22,18 +30,20 @@ Patch50: qt-mobility-opensource-src-1.2.0-translationsdir.patch
 # double-check if this is still required -- Rex
 Patch101: qt-mobility-opensource-src-1.1.0-pulseaudio-lib.patch
 
-BuildRequires: alsa-lib-devel
-BuildRequires: bluez-libs-devel
 BuildRequires: chrpath
-BuildRequires: gstreamer-plugins-bad-free-devel
-BuildRequires: gstreamer-plugins-base-devel
-BuildRequires: libXv-devel
-BuildRequires: libudev-devel
-BuildRequires: NetworkManager-devel
-BuildRequires: pulseaudio-libs-devel
+BuildRequires: pkgconfig(alsa)
+BuildRequires: pkgconfig(blkid)
+BuildRequires: pkgconfig(bluez)
+BuildRequires: pkgconfig(gstreamer-plugins-bad-0.10) 
+BuildRequires: pkgconfig(gstreamer-app-0.10)
+BuildRequires: pkgconfig(libpulse)
+BuildRequires: pkgconfig(libudev)
+BuildRequires: pkgconfig(NetworkManager)
+BuildRequires: pkgconfig(QtCore) pkgconfig(QtGui) pkgconfig(QtOpenGL)
+BuildRequires: pkgconfig(xv)
+
 ## under review, http://bugzilla.redhat.com/626122
 # BuildRequires: libqmf-devel >= 1.0
-BuildRequires: qt4-devel
 
 %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
 
@@ -102,6 +112,8 @@ PATH=%{_qt4_bindir}:$PATH; export PATH
 
 make %{?_smp_mflags} 
 
+make %{?_smp_mflags} qch_docs
+
 
 %install
 rm -rf %{buildroot}
@@ -132,11 +144,9 @@ rm -rf %{buildroot}
 
 %postun -p /sbin/ldconfig
 
-
 %files 
 %defattr(-,root,root,-)
 %doc LICENSE.LGPL LGPL_EXCEPTION.txt
-%doc changes*
 %{_qt4_libdir}/libQtBearer.so.1*
 %{_qt4_libdir}/libQtContacts.so.1*
 %{_qt4_libdir}/libQtConnectivity.so.1*
@@ -224,6 +234,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Sep 22 2011 Rex Dieter <rdieter at fedoraproject.org> 1.2.0-5.20110922
+- 20110922 snapshot
+- use pkgconfig-style deps
+
 * Wed Jul 20 2011 Rex Dieter <rdieter at fedoraproject.org> 1.2.0-4
 - rebuild (qt48)
 
diff --git a/sources b/sources
index e37d950..cc05fb2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ea5db5a8d3dd4709c2926dceda646bd8  qt-mobility-opensource-src-1.2.0.tar.gz
+1ebeffc0e51f9d406dd9cf9780c136f5  qt-mobility-opensource-src-1.2.0-20110922.tar.xz


More information about the scm-commits mailing list