From 93aca511999bc674f5287137f624dfe13e721fb6 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 03 2016 05:46:55 +0000 Subject: import qt5-qtconnectivity-5.6.1-10.el7 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3ebb6c6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/qtconnectivity-opensource-src-5.6.1.tar.xz diff --git a/.qt5-qtconnectivity.metadata b/.qt5-qtconnectivity.metadata new file mode 100644 index 0000000..69d74f3 --- /dev/null +++ b/.qt5-qtconnectivity.metadata @@ -0,0 +1 @@ +07fba0a67064338f7fe76783cf3fd785594f77f1 SOURCES/qtconnectivity-opensource-src-5.6.1.tar.xz diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/qtconnectivity-opensource-src-5.4.0-bswap_16.patch b/SOURCES/qtconnectivity-opensource-src-5.4.0-bswap_16.patch new file mode 100644 index 0000000..740f64d --- /dev/null +++ b/SOURCES/qtconnectivity-opensource-src-5.4.0-bswap_16.patch @@ -0,0 +1,14 @@ +diff --git a/src/bluetooth/bluez/bluez_data_p.h b/src/bluetooth/bluez/bluez_data_p.h +index 9d0d9d9..92f0e63 100644 +--- a/src/bluetooth/bluez/bluez_data_p.h ++++ b/src/bluetooth/bluez/bluez_data_p.h +@@ -168,6 +168,9 @@ static inline quint16 bt_get_le16(const void *ptr) + return bt_get_unaligned((const quint16 *) ptr); + } + #elif __BYTE_ORDER == __BIG_ENDIAN ++#ifndef bswap_16 ++#define bswap_16(x) (((x) & 0x00ff) << 8 | ((x) & 0xff00) >> 8) ++#endif + static inline quint16 bt_get_le16(const void *ptr) + { + return qbswap(bt_get_unaligned((const quint16 *) ptr)); diff --git a/SPECS/qt5-qtconnectivity.spec b/SPECS/qt5-qtconnectivity.spec new file mode 100644 index 0000000..4efb57d --- /dev/null +++ b/SPECS/qt5-qtconnectivity.spec @@ -0,0 +1,273 @@ + +%global qt_module qtconnectivity + +%define docs 1 + +#define prerelease + +Summary: Qt5 - Connectivity components +Name: qt5-%{qt_module} +Version: 5.6.1 +Release: 10%{?prerelease:.%{prerelease}}%{?dist} + +# See LICENSE.GPL3, respectively, for exception details +License: LGPLv2 with exceptions or GPLv3 with exceptions +Url: http://qt.io +Source0: http://download.qt.io/snapshots/qt/5.6/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz + +## upstreamable patches +# bswap_16 apparently missing on el6/ppc64 +Patch50: qtconnectivity-opensource-src-5.4.0-bswap_16.patch + +BuildRequires: cmake +BuildRequires: qt5-qtbase-devel >= %{version} +BuildRequires: pkgconfig(bluez) +BuildRequires: pkgconfig(Qt5Quick) + +%{?_qt5:Requires: %{_qt5}%{?_isa} >= %{_qt5_version}} + +%description +%{summary}. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: qt5-qtbase-devel%{?_isa} +%description devel +%{summary}. + +%if 0%{?docs} +%package doc +Summary: API documentation for %{name} +Requires: %{name} = %{version}-%{release} +BuildRequires: qt5-qdoc +BuildRequires: qt5-qhelpgenerator +BuildArch: noarch +%description doc +%{summary}. +%endif + +%package examples +Summary: Programming examples for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +%description examples +%{summary}. + + +%prep +%setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}} +%patch50 -p1 -b .bswap_16 + + +%build +mkdir %{_target_platform} +pushd %{_target_platform} +%{qmake_qt5} .. + +make %{?_smp_mflags} + +%if 0%{?docs} +make %{?_smp_mflags} docs +%endif +popd + + +%install +make install INSTALL_ROOT=%{buildroot} -C %{_target_platform} + +%if 0%{?docs} +make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform} +%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} +for prl_file in libQt5*.prl ; do + sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" ${prl_file} + if [ -f "$(basename ${prl_file} .prl).so" ]; then + rm -fv "$(basename ${prl_file} .prl).la" + sed -i -e "/^QMAKE_PRL_LIBS/d" ${prl_file} + fi +done +popd + + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files +%license LICENSE.GPL* LICENSE.LGPL* +%{_bindir}/sdpscanner +%{_qt5_bindir}/sdpscanner +%{_qt5_libdir}/libQt5Bluetooth.so.5* +%{_qt5_archdatadir}/qml/QtBluetooth/ +%{_qt5_libdir}/libQt5Nfc.so.5* +%{_qt5_archdatadir}/qml/QtNfc/ + +%files devel +%{_qt5_headerdir}/QtBluetooth/ +%{_qt5_libdir}/libQt5Bluetooth.so +%{_qt5_libdir}/libQt5Bluetooth.prl +%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_libdir}/libQt5Nfc.so +%{_qt5_libdir}/libQt5Nfc.prl +%dir %{_qt5_libdir}/cmake/Qt5Nfc/ +%{_qt5_libdir}/cmake/Qt5Nfc/Qt5NfcConfig*.cmake +%{_qt5_libdir}/pkgconfig/Qt5Nfc.pc +%{_qt5_archdatadir}/mkspecs/modules/qt_lib_nfc*.pri + +%if 0%{?docs} +%files doc +%license LICENSE.FDL +%{_qt5_docdir}/qtbluetooth.qch +%{_qt5_docdir}/qtbluetooth/ +%{_qt5_docdir}/qtnfc.qch +%{_qt5_docdir}/qtnfc/ +%endif + +%if 0%{?_qt5_examplesdir:1} +%files examples +%{_qt5_examplesdir}/ +%endif + + +%changelog +* Tue Aug 30 2016 Jan Grulich - 5.6.1-10 +- Increase build version to have newer version than in EPEL + Resolves: bz#1317399 + +* Wed Jun 08 2016 Jan Grulich - 5.6.1-1 +- Update to 5.6.1 + Resolves: bz#1317399 + +* Wed Apr 13 2016 Jan Grulich - 5.6.0-6 +- Enable documentation + Resolves: bz#1317399 + +* Thu Apr 07 2016 Jan Grulich - 5.6.0-5 +- Initial version for RHEL + Resolves: bz#1317399 + +* Sun Mar 20 2016 Rex Dieter - 5.6.0-4 +- rebuild + +* Sun Mar 20 2016 Rex Dieter - 5.6.0-3 +- rebuild + +* Fri Mar 18 2016 Rex Dieter - 5.6.0-2 +- rebuild + +* Mon Mar 14 2016 Helio Chissini de Castro - 5.6.0-1 +- 5.6.0 final release + +* Tue Feb 23 2016 Helio Chissini de Castro - 5.6.0-0.7.rc +- Update to final RC + +* Mon Feb 15 2016 Helio Chissini de Castro - 5.6.0-0.6 +- Update RC release + +* Thu Feb 04 2016 Fedora Release Engineering - 5.6.0-0.5.beta +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Dec 28 2015 Rex Dieter 5.6.0-0.4.beta +- BR: cmake, use %%license, update Source URL + +* Mon Dec 21 2015 Helio Chissini de Castro - 5.6.0-0.3 +- Update to final beta release + +* Thu Dec 10 2015 Helio Chissini de Castro - 5.6.0-0.2 +- Official beta release + +* Tue Nov 03 2015 Helio Chissini de Castro - 5.6.0-0.1 +- Start to implement 5.6.0 beta + +* Thu Oct 15 2015 Helio Chissini de Castro - 5.5.1-2 +- Update to final release 5.5.1 + +* Tue Sep 29 2015 Helio Chissini de Castro - 5.5.1-1 +- Update to Qt 5.5.1 RC1 + +* Wed Jul 29 2015 Rex Dieter 5.5.0-4 +- -docs: BuildRequires: qt5-qhelpgenerator, standardize bootstrapping macros + +* Sun Jul 26 2015 Helio Chissini de Castro - 5.5.0-3 +- Enabled docs + +* Thu Jul 16 2015 Rex Dieter 5.5.0-2 +- cleaner qtbase dep, .spec cosmetics + +* Wed Jul 1 2015 Helio Chissini de Castro 5.5.0-1 +- New final upstream release Qt 5.5.0 + +* Wed Jun 24 2015 Helio Chissini de Castro - 5.5.0-0.2.rc +- Update for official RC1 released packages + +* Mon Jun 15 2015 Daniel Vrátil - 5.5.0-0.1.rc +- Qt 5.5.0 RC1 + +* Wed Jun 03 2015 Jan Grulich -5.4.2-1 +- 5.4.2 + +* Sat May 02 2015 Kalev Lember - 5.4.1-3 +- Rebuilt for GCC 5 C++11 ABI change + +* Fri Feb 27 2015 Rex Dieter - 5.4.1-2 +- rebuild (gcc5) + +* Tue Feb 24 2015 Jan Grulich 5.4.1-1 +- 5.4.1 + +* Fri Jan 02 2015 Dan Horák 5.4.0-2 +- include the bswap patch in F-20 and F-21 builds too + +* Wed Dec 10 2014 Rex Dieter 5.4.0-1 +- 5.4.0 (final) + +* Fri Nov 28 2014 Rex Dieter 5.4.0-0.3.rc +- 5.4.0-rc + +* Mon Nov 03 2014 Rex Dieter 5.4.0-0.2.beta +- out-of-tree build, use %%qmake_qt5 + +* Sun Oct 19 2014 Rex Dieter 5.4.0-0.1.beta +- 5.4.0-beta + +* Tue Sep 16 2014 Rex Dieter 5.3.2-1 +- 5.3.2 + +* Sun Aug 17 2014 Fedora Release Engineering - 5.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Tue Jun 17 2014 Jan Grulich - 5.3.1-1 +- 5.3.1 + +* Sun Jun 08 2014 Fedora Release Engineering - 5.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed May 21 2014 Jan Grulich 5.3.0-1 +- 5.3.0 + +* Mon May 05 2014 Rex Dieter 5.2.1-2 +- sanitize .prl files + +* Wed Feb 05 2014 Rex Dieter 5.2.1-1 +- 5.2.1 + +* Thu Jan 02 2014 Rex Dieter 5.2.0-1 +- first try