[qt5-qtconnectivity] 5.4.0-beta

[Rex Dieter]

commit f7202d9e9a889ddf6a7167771b813f8f543dcc67
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Oct 19 16:12:36 2014 -0500

    5.4.0-beta

 .gitignore              |    1 +
 qt5-qtconnectivity.spec |   37 +++++++++++++++++++++++++++++--------
 sources                 |    2 +-
 3 files changed, 31 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e27a9b0..0291051 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /qtconnectivity-opensource-src-5.3.2.tar.xz
+/qtconnectivity-opensource-src-5.4.0-beta.tar.xz
diff --git a/qt5-qtconnectivity.spec b/qt5-qtconnectivity.spec
index 4249e26..5e8d9db 100644
--- a/qt5-qtconnectivity.spec
+++ b/qt5-qtconnectivity.spec
@@ -3,18 +3,20 @@
 # define to build docs, need to undef this for bootstrapping
 %define docs 1
 
+%define pre beta
+
 Summary: Qt5 - Connectivity components
 Name:    qt5-%{qt_module}
-Version: 5.3.2
-Release: 1%{?dist}
+Version: 5.4.0
+Release: 0.1.%{pre}%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 Url: http://qt-project.org/
 %if 0%{?pre:1}
-Source0: http://download.qt-project.org/development_releases/qt/5.3/%{version}-%{pre}/submodules/%{qt_module}-opensource-src-%{version}-%{pre}.tar.xz
+Source0: http://download.qt-project.org/development_releases/qt/5.4/%{version}-%{pre}/submodules/%{qt_module}-opensource-src-%{version}-%{pre}.tar.xz
 %else
-Source0: http://download.qt-project.org/official_releases/qt/5.3/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
+Source0: http://download.qt-project.org/official_releases/qt/5.4/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
 %endif
 
 BuildRequires: qt5-qtbase-devel >= %{version}
@@ -72,6 +74,18 @@ make install INSTALL_ROOT=%{buildroot}
 make install_docs INSTALL_ROOT=%{buildroot}
 %endif
 
+# hardlink files to %{_bindir}, add -qt5 postfix to not conflict
+mkdir %{buildroot}%{_bindir}
+pushd %{buildroot}%{_qt5_bindir}
+for i in * ; do
+  case "${i}" in
+    *)
+      ln -v  ${i} %{buildroot}%{_bindir}/${i}
+      ;;
+  esac
+done
+popd
+
 ## .prl/.la file love
 # nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs
 pushd %{buildroot}%{_qt5_libdir}
@@ -89,7 +103,9 @@ popd
 %postun -p /sbin/ldconfig
 
 %files
-%doc LGPL_EXCEPTION.txt LICENSE.GPL LICENSE.LGPL
+%doc LGPL_EXCEPTION.txt LICENSE.GPL* LICENSE.LGPL*
+%{_bindir}/sdpscanner
+%{_qt5_bindir}/sdpscanner
 %{_qt5_libdir}/libQt5Bluetooth.so.5*
 %{_qt5_archdatadir}/qml/QtBluetooth/
 %{_qt5_libdir}/libQt5Nfc.so.5*
@@ -99,13 +115,15 @@ popd
 %{_qt5_headerdir}/QtBluetooth/
 %{_qt5_libdir}/libQt5Bluetooth.so
 %{_qt5_libdir}/libQt5Bluetooth.prl
-%{_qt5_libdir}/cmake/Qt5Bluetooth/
+%dir %{_qt5_libdir}/cmake/Qt5Bluetooth/
+%{_qt5_libdir}/cmake/Qt5Bluetooth/Qt5BluetoothConfig*.cmake
 %{_qt5_libdir}/pkgconfig/Qt5Bluetooth.pc
 %{_qt5_archdatadir}/mkspecs/modules/qt_lib_bluetooth*.pri
-%{_qt5_headerdir}/QtNfc
+%{_qt5_headerdir}/QtNfc/
 %{_qt5_libdir}/libQt5Nfc.so
 %{_qt5_libdir}/libQt5Nfc.prl
-%{_qt5_libdir}/cmake/Qt5Nfc/
+%dir %{_qt5_libdir}/cmake/Qt5Nfc/
+%{_qt5_libdir}/cmake/Qt5Nfc/Qt5NfcConfig*.cmake
 %{_qt5_libdir}/pkgconfig/Qt5Nfc.pc
 %{_qt5_archdatadir}/mkspecs/modules/qt_lib_nfc*.pri
 
@@ -125,6 +143,9 @@ popd
 
 
 %changelog
+* Sun Oct 19 2014 Rex Dieter <rdieter at fedoraproject.org> 5.4.0-0.1.beta
+- 5.4.0-beta
+
 * Tue Sep 16 2014 Rex Dieter <rdieter at fedoraproject.org> 5.3.2-1
 - 5.3.2
 
diff --git a/sources b/sources
index f07213e..58fea71 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e496963407bb0c7b2e6c07133715a9cf  qtconnectivity-opensource-src-5.3.2.tar.xz
+83a4335ccc2237374b8a68e738fb6f0c  qtconnectivity-opensource-src-5.4.0-beta.tar.xz