Merge pull request #259 from heini/rhel_fedora_qt5

Switch RHEL family builds to QT5, too.
This commit is contained in:
Cyril Soler 2016-06-05 13:02:13 -04:00
commit 9f2d6bd5fc

View File

@ -7,8 +7,8 @@ Group: Productivity/Networking/Other
URL: http://retroshare.sourceforge.net/ URL: http://retroshare.sourceforge.net/
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: qt-x11 Requires: qt5-qtbase-gui qt5-qtmultimedia qt5-qtx11extras qt5-qtbase
BuildRequires: gcc-c++ qt-devel desktop-file-utils libgnome-keyring-devel glib2-devel libssh-devel protobuf-devel libcurl-devel libxml2-devel libxslt-devel openssl-devel libXScrnSaver-devel libupnp-devel bzip2-devel libmicrohttpd-devel BuildRequires: gcc-c++ desktop-file-utils libgnome-keyring-devel glib2-devel libssh-devel protobuf-devel libcurl-devel libxml2-devel libxslt-devel openssl-devel libXScrnSaver-devel libupnp-devel bzip2-devel libmicrohttpd-devel qt5-qtx11extras-devel qt5-qttools-devel qt5-qtmultimedia-devel qt5-qttools-static
# This is because of sqlcipher: # This is because of sqlcipher:
BuildRequires: tcl BuildRequires: tcl
@ -56,7 +56,7 @@ cd lib/sqlcipher
make make
cd - cd -
cd src cd src
qmake-qt4 "CONFIG-=debug" "CONFIG+=release" PREFIX=%{_prefix} LIB_DIR=%{_libdir} RetroShare.pro qmake-qt5 "CONFIG-=debug" "CONFIG+=release" PREFIX=%{_prefix} LIB_DIR=%{_libdir} RetroShare.pro
make make
cd - cd -