commit 73f2ccfec4c64e0f50381799a6d66380ea5c645f Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Wed Aug 17 23:10:50 2016 +0100 Update to 2.5.0 .gitignore | 1 + sources | 2 +- vokoscreen-main.patch | 41 ----------------------------------------- vokoscreen.spec | 32 +++++++++++++++++--------------- 4 files changed, 19 insertions(+), 57 deletions(-) --- diff --git a/.gitignore b/.gitignore index d93d997..695dd22 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ vokoscreen-2.4.0.tar.gz +/vokoscreen-2.5.0.tar.gz diff --git a/sources b/sources index 410f7d4..46eec1a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ac15692a0802d5310a98ac54b922fb6b vokoscreen-2.4.0.tar.gz +c4fd74a1a459dab818eb05df1ca93be0 vokoscreen-2.5.0.tar.gz diff --git a/vokoscreen.spec b/vokoscreen.spec index 1ff4cc1..9ccd152 100644 --- a/vokoscreen.spec +++ b/vokoscreen.spec @@ -1,24 +1,22 @@ Name: vokoscreen -Version: 2.4.0 -Release: 3%{?dist} +Version: 2.5.0 +Release: 1%{?dist} Summary: Screencast creator License: GPLv2+ and BSD Group: Applications/Multimedia Url: https://github.com/vkohaupt/vokoscreen Source: https://github.com/vkohaupt/vokoscreen/archive/%{version}.tar.gz#/%{name}... -# patch to link directly against the system libs -Patch0: %{name}-main.patch -# patch to avoid error message for non existing *.qm files -Patch1: %{name}-lrelease-qt4.patch BuildRequires: desktop-file-utils BuildRequires: alsa-lib-devel BuildRequires: ffmpeg-devel -BuildRequires: libqxt-devel BuildRequires: libv4l-devel +BuildRequires: libXrandr-devel BuildRequires: opencv-devel -BuildRequires: qt4-devel -BuildRequires: qtsingleapplication-devel +BuildRequires: qt5-linguist +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtx11extras-devel +BuildRequires: qtsingleapplication-qt5-devel Requires: alsa-utils Requires: ffmpeg Requires: lame @@ -33,14 +31,13 @@ videos, live recordings of browser, installation, videoconferences, etc. %prep %autosetup -p0 -# remove bundled libqxt + QtSingleApplication libraries -rm -f libqxtQt4/*.h -rm -f QtSingleApplicationQt4/qtsingleapplication.h +# remove bundled QtSingleApplication libraries +rm -rf QtSingleApplicationQt5 %build -%{qmake_qt4} \ - QMAKE_CXXFLAGS+=" -I%{_includedir}/QxtCore -I%{_includedir}/QxtGui -I%{_includedir}/QtSolutions -I%{_includedir}/QtNetwork" \ - QMAKE_LIBS+=" -lQtSolutions_SingleApplication-2.6" +%{qmake_qt5} \ + QMAKE_CXXFLAGS+=" -I%{_includedir}/qt5/QtSolutions" \ + QMAKE_LIBS+=" -lQt5Solutions_SingleApplication-2.6" make %{?_smp_mflags} all @@ -63,6 +60,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_mandir}/man1/%{name}.1.* %changelog +* Wed Aug 17 2016 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 2.5.0-1 +- Update to 2.5.0 +- Switch build to qt5 +- Use bundled libqtx5 + * Wed Aug 17 2016 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 2.4.0-3 - Harden build - Use qmake macro for build