From eca63e8d3b4894087e9394f6565f9eea3941772b Mon Sep 17 00:00:00 2001 From: hannes Date: Apr 25 2015 16:29:29 +0000 Subject: Switch to qt5 for building --- diff --git a/texstudio.spec b/texstudio.spec index 1ba3d9b..dbb9b0f 100644 --- a/texstudio.spec +++ b/texstudio.spec @@ -1,6 +1,6 @@ Name: texstudio Version: 2.9.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A feature-rich editor for LaTeX documents Group: Applications/Publishing @@ -12,15 +12,18 @@ URL: http://texstudio.sourceforge.net Source0: http://downloads.sourceforge.net/texstudio/texstudio-%{version}.tar.gz Source1: texstudio.desktop Patch0: texstudio-use-system-hunspell-instead-of-bundled-one.patch -Patch1: texstudio-use-system-qtsingleapplication-instead-of-bundled-on.patch -Patch2: texstudio-viewers-use-xdg-open.patch +Patch1: texstudio-viewers-use-xdg-open.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: qt4-devel +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qttools-devel +BuildRequires: qt5-qttools-static +BuildRequires: qt5-qtsvg-devel +BuildRequires: qt5-qtscript-devel BuildRequires: hunspell-devel BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: poppler-qt4-devel +BuildRequires: poppler-qt5-devel BuildRequires: qtsingleapplication-devel BuildRequires: qtsinglecoreapplication-devel @@ -43,14 +46,13 @@ so it keeps it look&feel. %prep %setup -q -n %{name}%{version} %patch0 -p1 -b .hunspell -%patch1 -p1 -b .qtsingle -%patch2 -p1 -b .xdg +%patch1 -p1 -b .xdg -rm -rf {hunspell,qtsingleapplication} +rm -rf {hunspell} %build -export QTDIR=%{_libdir}/qt4 -qmake-qt4 CONFIG-=debug \ +export QTDIR=%{_libdir}/qt5 +%{_qt5_qmake} CONFIG-=debug \ %ifnarch %{ix86} x86_64 %{arm} NO_CRASH_HANDLER=1 \ %endif @@ -58,7 +60,6 @@ qmake-qt4 CONFIG-=debug \ make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT make install INSTALL_ROOT=$RPM_BUILD_ROOT install -Dp -m 0644 utilities/texstudio16x16.png \ @@ -125,6 +126,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null ||: %doc utilities/AUTHORS utilities/COPYING utilities/CHANGELOG.txt %changelog +* Sat Apr 25 2015 Johannes Lips 2.9.4-2 +- switch to building with Qt5 +- removed qtsingleapplication patch - using bundled one + * Tue Mar 24 2015 Johannes Lips 2.9.4-1 - Update to latest upstream version 2.9.4 @@ -153,9 +158,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null ||: * Fri Jun 20 2014 Johannes Lips 2.8.0-1 - Update to latest upstream version 2.8.0 -* Sun Jun 08 2014 Fedora Release Engineering - 2.7.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - * Wed Mar 19 2014 Johannes Lips 2.7.0-1 - Update to latest upstream version 2.7.0