[qt-mobility] .spec cleanup, pkgconfig: +Requires.private: QtCore

[Rex Dieter]

commit 2eaa5c32b6ec872bb548177be3d601e6cb6be811
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Apr 28 07:36:35 2014 -0500

    .spec cleanup, pkgconfig: +Requires.private: QtCore

 qt-mobility.spec |   32 ++++++++------------------------
 1 files changed, 8 insertions(+), 24 deletions(-)
---
diff --git a/qt-mobility.spec b/qt-mobility.spec
index 30115cb..60b3344 100644
--- a/qt-mobility.spec
+++ b/qt-mobility.spec
@@ -5,10 +5,10 @@
 %define snap 20120224git
 
 Name:    qt-mobility
-Version: 1.2.2
-Release: 0.8.%{snap}%{?dist}
 Summary: Qt Mobility Framework
-Group:   System Environment/Libraries
+Version: 1.2.2
+Release: 0.9.%{snap}%{?dist}
+
 License: LGPLv2 with exceptions
 URL:     http://qt.nokia.com/products/qt-addons/mobility 
 %if 0%{?snap:1}
@@ -18,22 +18,18 @@ Source0: qt-mobility-opensource-src-%{version}-%{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}
 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
+# add pkgconfig for linux-* platforms too, Requires.private: QtCore
+Patch51: qt-mobility-opensource-src-1.2.2-pkgconfig.patch
 # gcc 4.7, missing unistd.h for getppid
 Patch52: qt-mobility-opensource-src-1.2.0-include-unistdh.patch
 # dso
 Patch53: qt-mobility-opensource-src-1.1.0-pulseaudio-lib.patch
-# -fpermissive hack around failed bluez checks
-# see also https://bugzilla.redhat.com/show_bug.cgi?id=797266
-#Patch54: qt-mobility-opensource-src-1.2.2-bluez_gcc47.patch
 
 ## upstream patches
 
@@ -68,7 +64,6 @@ of these technologies, but has applicability beyond the mobile device arena.
 
 %package devel
 Summary: Qt Mobility Framework development files
-Group: Development/Libraries
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: qt4-devel
 Provides: qt4-mobility-devel = %{version}-%{release}
@@ -88,7 +83,6 @@ Provides: %{name}-systeminfo-devel = %{version}-%{release}
 
 %package doc
 Summary: API documentation for %{name}
-Group: Documentation
 Requires: qt4
 BuildArch: noarch
 %description doc
@@ -96,7 +90,6 @@ BuildArch: noarch
 
 %package examples
 Summary: Qt Mobility Framework examples
-Group: Development/Libraries
 Requires: %{name}%{?_isa} = %{version}-%{release}
 %description examples
 %{summary}.
@@ -110,7 +103,6 @@ rm -r src/3rdparty/proj
 %patch51 -p1 -b .pkgconfig
 %patch52 -p1 -b .include-unistdh
 %patch53 -p1 -b .pulseaudio_lib
-#patch54 -p1 -b .bluez_gcc47
 
 
 %build
@@ -132,8 +124,6 @@ make %{?_smp_mflags} qch_docs
 
 
 %install
-rm -rf %{buildroot}
-
 make install INSTALL_ROOT=%{buildroot} 
 
 # manually install docs
@@ -152,16 +142,10 @@ chrpath --delete %{buildroot}%{_qt4_importdir}/*/*.so ||:
 chrpath --delete %{buildroot}%{_qt4_importdir}/*/*/*.so ||:
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 
 %files 
-%defattr(-,root,root,-)
 %doc LICENSE.LGPL LGPL_EXCEPTION.txt
 %{_qt4_libdir}/libQtBearer.so.1*
 %{_qt4_libdir}/libQtContacts.so.1*
@@ -182,7 +166,6 @@ rm -rf %{buildroot}
 %{_qt4_plugindir}/*
 
 %files devel
-%defattr(-,root,root,-)
 %{_bindir}/icheck
 %{_bindir}/ndefhandlergen
 %{_bindir}/qcrmlgen
@@ -198,13 +181,11 @@ rm -rf %{buildroot}
 %{_qt4_libdir}/pkgconfig/Qt*.pc
 
 %files doc
-%defattr(-,root,root,-)
 %{_qt4_docdir}/qch/qtmobility.qch
 %{_qt4_docdir}/html/qtmobility/
 
 %if 0%{?examples}
 %files examples
-%defattr(-,root,root,-)
 %{_qt4_bindir}/arrowkeys
 %{_qt4_bindir}/audiodevices
 %{_qt4_bindir}/audioinput
@@ -251,6 +232,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Apr 28 2014 Rex Dieter <rdieter at fedoraproject.org> 1.2.2-0.9.20120224git
+- .spec cleanup, pkgconfig: +Requires.private: QtCore
+
 * Wed Mar 19 2014 Ville Skyttä <ville.skytta at iki.fi> - 1.2.2-0.8.20120224git
 - Use system proj instead of bundled one