Merge branch 'master' into only_bundle_forharbour

packaging/osmscout-server.appdata.xml

@@ -3,6 +3,7 @@
  <id>io.github.rinigus.OSMScoutServer</id>
  <name>OSM Scout Server</name>
  <summary>Maps server providing tiles, geocoder, and router</summary>
+ <developer_name>Rinigus</developer_name>
  <description>
    <p>OSM Scout Server can be used as a drop-in replacement for online map services providing map tiles, search, and routing. As a result, an offline operation is possible if the device has a server and map client programs installed and running.</p>
    <p>To use the server, you have to start it and configure the client to access it. An example pages with JavaScript-based clients are provided. The server is supported by such clients as Pure Maps and modRana.</p>

rpm/harbour-osmscout-server.spec

@@ -124,7 +124,7 @@ desktop-file-install --delete-original       \
 %if %{with jollaharbour}
 # ship all shared libraries not allowed in Harbour with the app
 mkdir -p %{buildroot}%{_datadir}/%{name}/lib
-cp %{_libdir}/libmapnik.so.3.0 %{buildroot}%{_datadir}/%{name}/lib
+cp %{_libdir}/libmapnik.so.* %{buildroot}%{_datadir}/%{name}/lib
 cp %{_libdir}/libproj.so.12 %{buildroot}%{_datadir}/%{name}/lib
 cp %{_libdir}/libtiff.so.5 %{buildroot}%{_datadir}/%{name}/lib
 cp %{_libdir}/libharfbuzz.so.0 %{buildroot}%{_datadir}/%{name}/lib
@@ -157,7 +157,7 @@ cp %{_libdir}/liblz4.so.1* %{buildroot}%{_datadir}/%{name}/lib
 # the styles
 #cp -r %{_libdir}/mapnik %{buildroot}%{_datadir}/%{name}/lib
 
-strip %{buildroot}%{_datadir}/%{name}/lib/libmapnik.so.3.0
+strip %{buildroot}%{_datadir}/%{name}/lib/libmapnik.so.*
 #strip %{buildroot}%{_datadir}/%{name}/lib/libicudata.so.52
 
 # strip executable bit from all libraries