diff --git a/fingerterm.pro b/fingerterm.pro index f38b260..abdbf7c 100644 --- a/fingerterm.pro +++ b/fingerterm.pro @@ -49,17 +49,17 @@ RESOURCES += \ resources.qrc unix:!symbian:!maemo5 { - target.path = /opt/fingerterm/bin + target.path = /usr/bin INSTALLS += target } maemo5 { - target.path = /opt/fingerterm/bin + target.path = /usr/bin INSTALLS += target } contains(MEEGO_EDITION,harmattan) { - desktopfile.files = $${TARGET}fingerterm.desktop + desktopfile.files = $${TARGET}.desktop desktopfile.path = /usr/share/applications INSTALLS += desktopfile } @@ -71,8 +71,8 @@ contains(MEEGO_EDITION,harmattan) { } contains(MEEGO_EDITION,nemo) { - desktopfile.extra = cp $${TARGET}fingerterm.desktop.nemo fingerterm.desktop + desktopfile.extra = cp $${TARGET}.desktop.nemo $${TARGET}.desktop desktopfile.path = /usr/share/applications - desktopfile.files = fingerterm.desktop + desktopfile.files = $${TARGET}.desktop INSTALLS += desktopfile } diff --git a/rpm/fingerterm.spec b/rpm/fingerterm.spec index 7540e9f..de2966c 100644 --- a/rpm/fingerterm.spec +++ b/rpm/fingerterm.spec @@ -6,8 +6,11 @@ Group: System/Base License: GPLv2 Source0: %{name}-%{version}.tar.gz URL: https://github.com/nemomobile/fingerterm -BuildRequires: pkgconfig(QtCore) -BuildRequires: pkgconfig(QtOpenGL) +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5DBus) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5OpenGL) +BuildRequires: pkgconfig(Qt5Declarative) Obsoletes: meego-terminal <= 0.2.2 Provides: meego-terminal > 0.2.2 @@ -26,7 +29,7 @@ Provides: meego-terminal > 0.2.2 %build sed -i 's,/opt/fingerterm/,/usr/,' fingerterm.pro -qmake MEEGO_EDITION=nemo +qmake -qt=5 MEEGO_EDITION=nemo make %{?_smp_mflags}