commit fec6bd12856359d07b7242480c0d1530fe5f1a0c
Author: Elan Ruusamäe <[email protected]>
Date: Wed Apr 13 00:43:34 2016 +0300
build with qt5
without forcing to use qt5, it used qt4/qt5 mixed, causing crashes
- Qt5Concurrent-devel -- By not providing "FindQt5Concurrent.cmake" in
CMAKE_MODULE_PATH this
- Qt5Xml-devel -- By not providing "FindQt5Xml.cmake" in
CMAKE_MODULE_PATH this project has
owncloudclient.spec | 28 ++++++++++++++++------------
1 file changed, 16 insertions(+), 12 deletions(-)
---
diff --git a/owncloudclient.spec b/owncloudclient.spec
index 2a5193d..a015622 100644
--- a/owncloudclient.spec
+++ b/owncloudclient.spec
@@ -11,6 +11,7 @@
%undefine with_doc
%endif
+%define qtver 5.4
Summary: The ownCloud client
Name: owncloudclient
Version: 2.1.1
@@ -20,19 +21,21 @@ Group: X11/Applications
Source0:
https://download.owncloud.com/desktop/stable/%{name}-%{version}.tar.xz
# Source0-md5: 63a971158201a8dffe96a02c54b86819
URL: https://www.owncloud.com/
-BuildRequires: QtCore-devel
-BuildRequires: QtDBus-devel
-BuildRequires: QtGui-devel
-BuildRequires: QtKeychain-devel
-BuildRequires: QtNetwork-devel
-BuildRequires: QtSql-devel
-BuildRequires: QtWebKit-devel
-BuildRequires: QtXmlPatterns-devel
+BuildRequires: Qt5Concurrent-devel
+BuildRequires: Qt5Core-devel >= %{qtver}
+BuildRequires: Qt5DBus-devel >= %{qtver}
+BuildRequires: Qt5Gui-devel >= %{qtver}
+BuildRequires: Qt5Keychain-devel
+BuildRequires: Qt5Network-devel >= %{qtver}
+BuildRequires: Qt5Sql-devel >= %{qtver}
+BuildRequires: Qt5WebKit-devel >= %{qtver}
+BuildRequires: Qt5Xml-devel >= %{qtver}
+BuildRequires: Qt5XmlPatterns-devel >= %{qtver}
BuildRequires: cmake >= 2.8.11
BuildRequires: libstdc++-devel
BuildRequires: openssl-devel >= 1.0.0
BuildRequires: pkgconfig
-BuildRequires: qt4-linguist
+BuildRequires: qt5-linguist >= %{qtver}
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.596
BuildRequires: sqlite3-devel >= 3.8.0
@@ -132,9 +135,10 @@ Nautilus file manager.
install -d build
cd build
%cmake \
- -DQTKEYCHAIN_INCLUDE_DIR=/usr/include/qtkeychain \
- -DQTKEYCHAIN_LIBRARY=/usr/%{_lib}/libqtkeychain.so \
- -DQT_LRELEASE_EXECUTABLE=/usr/bin/lrelease-qt4 \
+ -DQTKEYCHAIN_INCLUDE_DIR=/usr/include/qt5keychain \
+ -DQTKEYCHAIN_LIBRARY=/usr/%{_lib}/libqt5keychain.so \
+ -DQT_LRELEASE_EXECUTABLE=/usr/bin/lrelease-qt5 \
+ -DBUILD_WITH_QT4=NO \
%if %{with doc}
-DSPHINX_EXECUTABLE=/usr/bin/sphinx-build-2 \
-DPDFLATEX_EXECUTABLE=/usr/bin/pdflatex \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/owncloudclient.git/commitdiff/fec6bd12856359d07b7242480c0d1530fe5f1a0c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
