Author: martinkg Update of /cvs/free/rpms/vokoscreen/F-20 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7831/F-20 Modified Files: .cvsignore sources Added Files: vokoscreen-main.patch vokoscreen.spec Log Message: vokoscreen-main.patch: QtSingleApplication/qtsingleapplication.pri | 4 ++-- libqxt/libqxt.pri | 6 +++--- main.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) --- NEW FILE vokoscreen-main.patch --- --- main.orig.cpp 2014-03-19 08:46:47.000000000 +0100 +++ main.cpp 2014-09-20 11:51:16.903702078 +0200 @@ -17,7 +17,7 @@ #include "screencast.h" //#include <QSplashScreen> -#include <QtSingleApplication/qtsingleapplication.h> +#include <qtsingleapplication.h> #include <QDebug> #include <QTranslator> #include <QLocale> --- QtSingleApplication/qtsingleapplication.orig.pri 2014-03-19 08:46:47.000000000 +0100 +++ QtSingleApplication/qtsingleapplication.pri 2014-09-20 12:19:44.953276406 +0200 @@ -1,4 +1,4 @@ -INCLUDEPATH += $$PWD +INCLUDEPATH += /usr/include DEPENDPATH += $$PWD QT *= network @@ -6,7 +6,7 @@ LIBS += -L$$QTSINGLEAPPLICATION_LIBDIR -l$$QTSINGLEAPPLICATION_LIBNAME } else { SOURCES += $$PWD/qtsingleapplication.cpp $$PWD/qtlocalpeer.cpp - HEADERS += $$PWD/qtsingleapplication.h $$PWD/qtlocalpeer.h + HEADERS += $$INCLUDEPATH/QtSolutions/qtsingleapplication.h $$PWD/qtlocalpeer.h } win32 { --- libqxt/libqxt.orig.pri 2014-03-19 08:46:47.000000000 +0100 +++ libqxt/libqxt.pri 2014-09-20 12:08:57.727640675 +0200 @@ -1,6 +1,6 @@ -INCLUDEPATH += $$PWD +INCLUDEPATH += /usr/include DEPENDPATH += $$PWD -HEADERS += $$PWD/qxtglobal.h $$PWD/qxtwindowsystem.h $$PWD/qxtglobalshortcut.h $$PWD/qxtglobalshortcut_p.h +HEADERS += $$INCLUDEPATH/QxtCore/qxtglobal.h $$INCLUDEPATH/QxtGui/qxtwindowsystem.h $$INCLUDEPATH/QxtGui/qxtglobalshortcut.h $$INCLUDEPATH/QxtGui/qxtglobalshortcut_p.h SOURCES += $$PWD/qxtglobal.cpp $$PWD/qxtwindowsystem_x11.cpp $$PWD/qxtglobalshortcut_x11.cpp $$PWD/qxtglobalshortcut.cpp -LIBS += -lX11 \ No newline at end of file +LIBS += -lX11 --- NEW FILE vokoscreen.spec --- Name: vokoscreen Version: 2.0.0 Release: 4%{?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 # patch to link directly against the system libs Patch0: %{name}-main.patch BuildRequires: desktop-file-utils BuildRequires: alsa-lib-devel BuildRequires: ffmpeg-devel BuildRequires: libqxt-devel BuildRequires: opencv-devel BuildRequires: qt4-devel BuildRequires: qtsingleapplication-devel Requires: alsa-utils Requires: mkvtoolnix Requires: pulseaudio-utils Requires: v4l-utils-devel-tools %description vokoscreen is an easy to use screencast creator to record educational videos, live recordings of browser, installation, videoconferences, etc. %prep %setup -q %patch0 -p0 # remove bundled libqxt + QtSingleApplication libraries rm -f libqxt/*.h rm -f QtSingleApplication/qtsingleapplication.h %build qmake-qt4 \ QMAKE_STRIP="" \ QMAKE_LRELEASE=%{_libdir}/qt4/bin/lrelease \ QMAKE_CFLAGS+="%{optflags} -I%{_includedir}/QxtCore -I%{_includedir}/QxtGui -I%{_includedir}/QtSolutions -I%{_includedir}/QtNetwork" \ QMAKE_CXXFLAGS+="%{optflags} -I%{_includedir}/QxtCore -I%{_includedir}/QxtGui -I%{_includedir}/QtSolutions -I%{_includedir}/QtNetwork" \ QMAKE_LIBS+="%{optflags} -L%{_libdir} -lQxtCore -lQxtGui -lQtNetwork -lQtSolutions_SingleApplication-2.6" make %{?_smp_mflags} all %install make INSTALL_ROOT=%{buildroot} install desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %post /usr/bin/update-desktop-database &> /dev/null || : %postun /usr/bin/update-desktop-database &> /dev/null || : %files %doc AUTHORS COPYING CHANGE CREDITS SPECIAL-FEATURE %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_mandir}/man1/%{name}.1.gz %{_datadir}/pixmaps/%{name}.png %changelog * Sun Sep 21 2014 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 2.0.0-4 - fixed typos - changed QMAKE_LRELEASE option - added BSD to license tag * Sun Sep 21 2014 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 2.0.0-3 - added BSD to license tag - leaved comment what patch do * Fri Sep 19 2014 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 2.0.0-2 - added patch to use system libraries - added QMAKE flags to compile against system libraries - added BR libqxt-devel - added BR qtsingleapplication-devel - added BR desktop-file-utils - added %%desktop-file-validate - added %%post and %%postun section * Fri Sep 19 2014 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 2.0.0-1 - initial build for Fedora Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/vokoscreen/F-20/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 28 Sep 2014 11:06:59 -0000 1.1 +++ .cvsignore 28 Sep 2014 15:51:00 -0000 1.2 @@ -0,0 +1 @@ +2.0.0.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/vokoscreen/F-20/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 28 Sep 2014 11:07:00 -0000 1.1 +++ sources 28 Sep 2014 15:51:00 -0000 1.2 @@ -0,0 +1 @@ +429234805ae48e2f4b57729d6fd8381d 2.0.0.tar.gz