From ab34d4db59769b360845dc25cc2adbd0be772eec8025f2bcaeed9222c3ba817f Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 18 Feb 2014 15:18:17 +0000 Subject: [PATCH] Accepting request 221705 from KDE:Qt5 install license files to %doc (forwarded request 221619 from mlin7442) OBS-URL: https://build.opensuse.org/request/show/221705 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtsensors?expand=0&rev=7 --- libqt5-qtsensors.changes | 13 +++++++ libqt5-qtsensors.spec | 52 +++++++++++++++++++-------- qtsensors-opensource-src-5.2.0.tar.xz | 3 -- qtsensors-opensource-src-5.2.1.tar.xz | 3 ++ 4 files changed, 54 insertions(+), 17 deletions(-) delete mode 100644 qtsensors-opensource-src-5.2.0.tar.xz create mode 100644 qtsensors-opensource-src-5.2.1.tar.xz diff --git a/libqt5-qtsensors.changes b/libqt5-qtsensors.changes index d28ab4d..ab9c4e1 100644 --- a/libqt5-qtsensors.changes +++ b/libqt5-qtsensors.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Feb 10 11:22:02 UTC 2014 - mlin@suse.com + +- Install LICENSE files to %doc + +------------------------------------------------------------------- +Wed Feb 5 17:07:24 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to 5.2.1: + * For more details please see: + http://blog.qt.digia.com/blog/2014/02/05/qt-5-2-1-released/ +- Remove libtool archives from packages + ------------------------------------------------------------------- Mon Dec 16 23:19:32 UTC 2013 - hrvoje.senjan@gmail.com diff --git a/libqt5-qtsensors.spec b/libqt5-qtsensors.spec index 1c56fba..e9c5dbe 100644 --- a/libqt5-qtsensors.spec +++ b/libqt5-qtsensors.spec @@ -1,7 +1,7 @@ # # spec file for package libqt5-qtsensors # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,22 +16,35 @@ # +%define qt5_snapshot 0 + %define libname libQt5Sensors5 Name: libqt5-qtsensors -Version: 5.2.0 +Version: 5.2.1 Release: 0 Summary: Qt 5 Serial Port Addon License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0 Group: Development/Libraries/X11 Url: http://qt.digia.com +%define base_name libqt5 +%define real_version 5.2.1 +%define so_version 5.2.1 +%if %qt5_snapshot +%define tar_version qtsensors-%{real_version} +%else +%define tar_version qtsensors-opensource-src-%{real_version} +%endif Source: %{tar_version}.tar.xz BuildRequires: fdupes -%define base_name libqt5 -%define real_version 5.2.0 -%define so_version 5.2.0 -%define tar_version qtsensors-opensource-src-%{real_version} -BuildRequires: libqt5-qtbase-private-headers-devel >= %{version} +BuildRequires: libQt5Core-private-headers-devel >= %{version} +BuildRequires: pkgconfig(Qt5Core) >= %{version} +BuildRequires: pkgconfig(Qt5Qml) >= %{version} +BuildRequires: pkgconfig(Qt5Quick) >= %{version} +%if %qt5_snapshot +#to create the forwarding headers +BuildRequires: perl +%endif BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -39,7 +52,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Qt is a set of libraries for developing applications. %prep +%if %qt5_snapshot +%setup -q -n qtsensors-%{real_version} +%else %setup -q -n qtsensors-opensource-src-%{real_version} +%endif %package -n %libname Summary: Qt 5 Serial Port Addon @@ -52,10 +69,8 @@ Qt is a set of libraries for developing applications. Summary: Qt Development Kit Group: Development/Libraries/X11 Requires: %libname = %{version} -Requires: libqt5-qtbase-devel >= %{version} Provides: libQt5Sensors-devel = %{version} -# TODO: change to < on 5.2.1 update -Obsoletes: libQt5Sensors-devel <= %{version} +Obsoletes: libQt5Sensors-devel < %{version} %description devel You need this package, if you want to compile programs with qtsensors. @@ -64,10 +79,9 @@ You need this package, if you want to compile programs with qtsensors. Summary: Non-ABI stable experimental API Group: Development/Libraries/C and C++ Requires: %{name}-devel = %{version} -Requires: libqt5-qtbase-private-headers-devel >= %{version} +Requires: libQt5Core-private-headers-devel >= %{version} Provides: libQt5Sensors-private-headers-devel = %{version} -# TODO: change to < on 5.2.1 update -Obsoletes: libQt5Sensors-private-headers-devel <= %{version} +Obsoletes: libQt5Sensors-private-headers-devel < %{version} %description private-headers-devel This package provides private headers of libqt5-qtsensors that are normally @@ -80,28 +94,38 @@ the exact Qt version. %postun -n %libname -p /sbin/ldconfig %build +%if %qt5_snapshot +#force the configure script to generate the forwarding headers (it checks whether .git directory exists) +mkdir .git +%endif %qmake5 %make_jobs %install %qmake5_install +# kill .la files +rm -f %{buildroot}%{_libqt5_libdir}/lib*.la + %files -n %libname %defattr(-,root,root,755) +%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL %{_libqt5_libdir}/libQt5Sensors.so.* +%{_libqt5_archdatadir}/qml/QtSensors/ %{_libqt5_plugindir}/sensors %{_libqt5_plugindir}/sensorgestures %files private-headers-devel %defattr(-,root,root,755) +%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL %{_libqt5_includedir}/QtSensors/%{so_version} %files devel %defattr(-,root,root,755) +%doc LGPL_EXCEPTION.txt LICENSE.FDL LICENSE.GPL LICENSE.LGPL %exclude %{_libqt5_includedir}/QtSensors/%{so_version} %{_libqt5_includedir}/QtSensors %{_libqt5_libdir}/cmake/Qt5Sensors -%{_libqt5_libdir}/libQt5Sensors.la %{_libqt5_libdir}/libQt5Sensors.prl %{_libqt5_libdir}/libQt5Sensors.so %{_libqt5_libdir}/pkgconfig/Qt5Sensors.pc diff --git a/qtsensors-opensource-src-5.2.0.tar.xz b/qtsensors-opensource-src-5.2.0.tar.xz deleted file mode 100644 index 8a90362..0000000 --- a/qtsensors-opensource-src-5.2.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5934651affead2b7e70fd7a3dedcbfbf7ef3d7b64a9ac4142622f7afff578446 -size 2132932 diff --git a/qtsensors-opensource-src-5.2.1.tar.xz b/qtsensors-opensource-src-5.2.1.tar.xz new file mode 100644 index 0000000..8f422ad --- /dev/null +++ b/qtsensors-opensource-src-5.2.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:09403e7e088f30da828e452559a6904d7c43420d423a429d6529285f99b1e407 +size 2132992