Changes - SailfishOS Open Build Service

Changes of Revision 136

[-] [+]	Changed	_service:tar_git:harbour-osmscout-server.spec
@@ -16,7 +16,7 @@ %endif Summary: OSM Scout Server -Version: 1.17.1 +Version: 1.17.1+master.20210328182942.98.g6706a46 Release: 1 Group: Qt/Qt License: GPLv3 @@ -43,6 +43,7 @@ BuildRequires: pkgconfig(libpostal) >= 1.0.0 BuildRequires: qt5-qttools-linguist BuildRequires: pkgconfig(libvalhalla) +BuildRequires: pkgconfig(date) BuildRequires: protobuf-devel BuildRequires: boost-devel >= 1.51 BuildRequires: boost-date-time >= 1.51 @@ -57,9 +58,9 @@ %if 0%{?sailfishos} Requires: sailfishsilica-qt5 >= 0.10.9 BuildRequires: pkgconfig(sailfishapp) >= 1.0.2 -BuildRequires: libosmscout-qt-devel BuildRequires: mapnik-devel -BuildRequires: pkgconfig(libsystemd-daemon) +#BuildRequires: pkgconfig(libsystemd-daemon) +BuildRequires: pkgconfig(libsystemd) %else BuildRequires: pkgconfig(libsystemd) BuildRequires: cmake(KF5Kirigami2) @@ -78,9 +79,9 @@ %build %if 0%{?sailfishos} -%qmake5 VERSION='%{version}-%{release}' SCOUT_FLAVOR='silica' +%qmake5 VERSION='%{version}-%{release}' SCOUT_FLAVOR='silica' CONFIG+=use_dbusactivation VALHALLA_VERSION=3.1 %else -%qmake5 VERSION='%{version}-%{release}' SCOUT_FLAVOR='kirigami' CONFIG+=disable_osmscout +%qmake5 VERSION='%{version}-%{release}' SCOUT_FLAVOR='kirigami' CONFIG+=use_dbusactivation VALHALLA_VERSION=3.1 %endif make %{?_smp_mflags} @@ -89,7 +90,6 @@ rm -rf %{buildroot} make install INSTALL_ROOT=%{buildroot} - desktop-file-install --delete-original \ --dir %{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/.desktop @@ -144,11 +144,13 @@ %files %defattr(-,root,root,-) %{_bindir}/%{name} +%{_bindir}/%{name}-gui %{_datadir}/%{name} +%{_datadir}/dbus-1/services/io.github.rinigus.OSMScoutServer.service %{_datadir}/icons/hicolor//apps/%{name}.png -%{_datadir}/applications/%{name}.desktop +%{_datadir}/applications/%{name}-gui.desktop %if 0%{?sailfishos} -%{_datadir}/%{name}/translations +%{_datadir}/%{name}-gui %else %{_datadir}/metainfo/%{name}.appdata.xml %endif
	Added	_service:tar_git:harbour-osmscout-server-1.17.1+master.20210328182942.98.g6706a46.tar.bz2 ^
	Deleted	_service:tar_git:harbour-osmscout-server-1.17.1.tar.bz2 ^