diff --git a/plugin/CMakeLists.txt b/plugin/CMakeLists.txt index 7fd03b9..2cdbce8 100644 --- a/plugin/CMakeLists.txt +++ b/plugin/CMakeLists.txt @@ -1,6 +1,8 @@ project(sailfishutilitiesplugin) -set(COMPONENT_DIR lib/qt5/qml/Sailfish/Utilities) +include(GNUInstallDirs) + +set(COMPONENT_DIR ${CMAKE_INSTALL_LIBDIR}/qt5/qml/Sailfish/Utilities) install(FILES qmldir ActionItem.qml DESTINATION ${COMPONENT_DIR}) diff --git a/rpm/sailfish-utilities.spec b/rpm/sailfish-utilities.spec index 411ef3f..a3b8343 100644 --- a/rpm/sailfish-utilities.spec +++ b/rpm/sailfish-utilities.spec @@ -5,7 +5,6 @@ Name: sailfish-utilities Version: 0.0.0 Release: 1 License: LGPLv2.1 -Group: System Environment/Tools URL: https://github.com/sailfishos/sailfish-utilities Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot @@ -24,6 +23,7 @@ BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Qml) BuildRequires: pkgconfig(Qt5Quick) BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: systemd %if %{with l10n} BuildRequires: %{name}-all-translations-pack %define _all_translations_version %(rpm -q --queryformat "%%{version}-%%{release}" %{name}-all-translations-pack) @@ -38,8 +38,6 @@ Summary: Translation source for %{name} %description ts-devel Translation source for %{name} -%define _userunitdir %{_libdir}/systemd/user/ - %prep %setup -q