use %make_build %ldconfig_scriptlets
This commit is contained in:
Rex Dieter 2018-05-27 07:13:56 -05:00
parent 0bc53c95a9
commit 2139e3f29d
4 changed files with 10 additions and 27 deletions

4
.gitignore vendored
View File

@ -1,5 +1 @@
/qt3d-opensource-src-5.9.1.tar.xz
/qt3d-opensource-src-5.9.2.tar.xz
/qt3d-opensource-src-5.9.3.tar.xz
/qt3d-everywhere-src-5.10.0.tar.xz
/qt3d-everywhere-src-5.10.1.tar.xz /qt3d-everywhere-src-5.10.1.tar.xz

View File

@ -1,11 +0,0 @@
diff -up qt3d-opensource-src-5.9.0-beta3/src/3rdparty/assimp/code/glTFAsset.inl.than qt3d-opensource-src-5.9.0-beta3/src/3rdparty/assimp/code/glTFAsset.inl
--- qt3d-opensource-src-5.9.0-beta3/src/3rdparty/assimp/code/glTFAsset.inl.than 2017-05-10 11:48:47.727867274 -0400
+++ qt3d-opensource-src-5.9.0-beta3/src/3rdparty/assimp/code/glTFAsset.inl 2017-05-10 11:48:29.407529841 -0400
@@ -40,6 +40,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#include "StringUtils.h"
+using namespace Assimp;
namespace glTF {
namespace {

View File

@ -2,14 +2,15 @@
Summary: Qt5 - Qt3D QML bindings and C++ APIs Summary: Qt5 - Qt3D QML bindings and C++ APIs
Name: qt5-%{qt_module} Name: qt5-%{qt_module}
Version: 5.10.1 Version: 5.11.0
Release: 2%{?dist} Release: 1%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
# See also http://doc.qt.io/qt-5/licensing.html # See also http://doc.qt.io/qt-5/licensing.html
License: LGPLv2 with exceptions or GPLv3 with exceptions License: LGPLv2 with exceptions or GPLv3 with exceptions
Url: http://www.qt.io Url: http://www.qt.io
Source0: https://download.qt.io/official_releases/qt/5.10/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz %global majmin %(echo %{version} | cut -d. -f1-2)
Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz
BuildRequires: qt5-rpm-macros >= %{version} BuildRequires: qt5-rpm-macros >= %{version}
BuildRequires: qt5-qtbase-static >= %{version} BuildRequires: qt5-qtbase-static >= %{version}
@ -27,9 +28,6 @@ BuildRequires: pkgconfig(assimp) >= 3.3.1
Requires: qt5-qtimageformats%{?_isa} >= %{version} Requires: qt5-qtimageformats%{?_isa} >= %{version}
# namespace on big endian platforms
Patch1: qt3d-namespace-big-endian.patch
%description %description
Qt 3D provides functionality for near-realtime simulation systems with Qt 3D provides functionality for near-realtime simulation systems with
support for 2D and 3D rendering in both Qt C++ and Qt Quick applications). support for 2D and 3D rendering in both Qt C++ and Qt Quick applications).
@ -51,13 +49,11 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%prep %prep
%setup -q -n %{qt_module}-everywhere-src-%{version} %setup -q -n %{qt_module}-everywhere-src-%{version}
%patch1 -p1 -b .namespace-big-endian.patch
%build %build
%{qmake_qt5} %{qmake_qt5}
make %{?_smp_mflags} %make_build
%install %install
@ -76,8 +72,7 @@ done
popd popd
%post -p /sbin/ldconfig %ldconfig_scriptlets
%postun -p /sbin/ldconfig
%files %files
%license LICENSE.GPL* LICENSE.LGPL* %license LICENSE.GPL* LICENSE.LGPL*
@ -171,6 +166,10 @@ popd
%changelog %changelog
* Sun May 27 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.0-1
- 5.11.0
- use %%make_build %%ldconfig_scriptlets
* Thu Mar 08 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.10.1-2 * Thu Mar 08 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.10.1-2
- BR: qt5-rpm-macros - BR: qt5-rpm-macros

View File

@ -1 +0,0 @@
SHA512 (qt3d-everywhere-src-5.10.1.tar.xz) = 2f670e74dafd2ee33759693f3f71407d87742538833a3a2d7281d629eeb954b290bea3de98d85ca9f8113409c93b212750ffe3593f03625a1dd122a7193b53ba