diff --git a/.gitignore b/.gitignore index 12fadf7..28ce911 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1 @@ -/qtenginio-opensource-src-5.5.0.tar.xz -/qtenginio-opensource-src-5.5.1-rc1.tar.xz -/qtenginio-opensource-src-5.5.1.tar.xz -/qtenginio-opensource-src-5.6.0-beta1.tar.xz -/qtenginio-opensource-src-5.6.0-rc.tar.xz -/qtenginio-opensource-src-1.6.0-rc.tar.xz /qtenginio-opensource-src-1.6.0.tar.xz diff --git a/qt5-qtenginio.spec b/qt5-qtenginio.spec index 4108c7a..9162111 100644 --- a/qt5-qtenginio.spec +++ b/qt5-qtenginio.spec @@ -7,9 +7,9 @@ Summary: Qt5 - Enginio component Name: qt5-%{qt_module} +Epoch: 1 Version: 1.6.0 Release: 1%{?prerelease:.%{prerelease}}%{?dist} -Epoch: 1 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://doc.qt.io/qt-5/licensing.html @@ -17,18 +17,16 @@ License: LGPLv2 with exceptions or GPLv3 with exceptions Url: http://www.qt.io Source0: http://download.qt.io/snapshots/qt/5.6/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz -BuildRequires: qt5-qtbase-devel >= %{version} +BuildRequires: qt5-qtbase-devel >= 5.6 BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Quick) -%{?_qt5_version:Requires: qt5-qtbase%{?_isa} >= %{_qt5_version}} - %description Client library for accessing Enginio service from Qt and QML code. %package devel Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: qt5-qtbase-devel%{?_isa} %description devel %{summary}. @@ -37,7 +35,7 @@ Requires: qt5-qtbase-devel%{?_isa} %package doc Summary: API documentation for %{name} License: GFDL -Requires: %{name} = %{version}-%{release} +#Requires: %{name} = %{epoch}:%{version}-%{release} BuildRequires: qt5-qdoc BuildRequires: qt5-qhelpgenerator BuildArch: noarch @@ -47,7 +45,7 @@ BuildArch: noarch %package examples Summary: Programming examples for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} %description examples %{summary}. @@ -55,6 +53,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %prep %setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}} + %build mkdir %{_target_platform} pushd %{_target_platform} @@ -70,6 +69,7 @@ make %{?_smp_mflags} docs %endif popd + %install make install INSTALL_ROOT=%{buildroot} -C %{_target_platform} @@ -89,12 +89,13 @@ fi done popd + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%doc LICENSE* LGPL_EXCEPTION.txt -%{_qt5_libdir}/libEnginio.so.5* +%license LICENSE* LGPL_EXCEPTION.txt +%{_qt5_libdir}/libEnginio.so.1* %{_qt5_archdatadir}/qml/Enginio/ %files devel