diff --git a/.gitignore b/.gitignore
index 6f1b404..1c1fd6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1 @@
-/marble-17.12.0.tar.xz
-/marble-17.12.1.tar.xz
-/marble-17.12.2.tar.xz
-/marble-17.12.3.tar.xz
 /marble-18.03.90.tar.xz
diff --git a/marble.spec b/marble.spec
index e26f6af..74020a0 100644
--- a/marble.spec
+++ b/marble.spec
@@ -155,7 +155,7 @@ pushd %{_target_platform}-qt5
   -DMARBLE_PRI_INSTALL_USE_QT_SYS_PATHS:BOOL=TRUE \
   -DWITH_DESIGNER_PLUGIN:BOOL=OFF
 
-make %{?_smp_mflags}
+%make_build
 popd
 
 
@@ -174,24 +174,25 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.marble.deskto
 desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.marble-qt.desktop
 
 
-%postun
-if [ $1 -eq 0 ] ; then
-update-desktop-database -q &> /dev/null ||:
-fi
+   /usr/share/appdata/org.kde.plasma.worldmap.appdata.xml
+   /usr/share/kservices5/plasma-wallpaper-org.kde.plasma.worldmap.desktop
+   /usr/share/plasma/wallpapers/org.kde.plasma.worldmap/contents/config/main.xml
+   /usr/share/plasma/wallpapers/org.kde.plasma.worldmap/contents/ui/config.qml
+   /usr/share/plasma/wallpapers/org.kde.plasma.worldmap/contents/ui/main.qml
+   /usr/share/plasma/wallpapers/org.kde.plasma.worldmap/metadata.desktop
+   /usr/share/plasma/wallpapers/org.kde.plasma.worldmap/metadata.json
 
-%posttrans
-update-desktop-database -q &> /dev/null ||:
 
 %files
 %{_bindir}/marble
 %{_datadir}/kxmlgui5/marble/
 %{_kf5_metainfodir}/org.kde.marble.appdata.xml
-%{_kf5_metainfodir}/org.kde.plasma.wallpaper.worldmap.appdata.xml
+%{_kf5_metainfodir}/org.kde.plasma.worldmap.appdata.xml
 %{_kf5_metainfodir}/org.kde.plasma.worldclock.appdata.xml
 %{_datadir}/kservices5/plasma-applet-org.kde.plasma.worldclock.desktop
-%{_datadir}/kservices5/plasma-wallpaper-org.kde.plasma.wallpaper.worldmap.desktop
+%{_datadir}/kservices5/plasma-wallpaper-org.kde.plasma.worldmap.desktop
 %{_datadir}/plasma/plasmoids/org.kde.plasma.worldclock/
-%{_datadir}/plasma/wallpapers/org.kde.plasma.wallpaper.worldmap/
+%{_datadir}/plasma/wallpapers/org.kde.plasma.worldmap/
 %{_datadir}/applications/org.kde.marble.desktop
 %{_datadir}/applications/marble_geo.desktop
 %{_datadir}/applications/marble_geojson.desktop
@@ -210,22 +211,6 @@ update-desktop-database -q &> /dev/null ||:
 %{_datadir}/kservices5/plasma-runner-marble.desktop
 %{_sysconfdir}/xdg/marble.knsrc
 
-%post common
-touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
-touch --no-create %{_datadir}/mime/packages &> /dev/null || :
-
-%posttrans common
-gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
-update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
-
-%postun common
-if [ $1 -eq 0 ] ; then
-touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
-gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
-touch --no-create %{_datadir}/mime/packages &> /dev/null || :
-update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
-fi
-
 %files common -f %{name}.lang
 %license LICENSE.txt
 %doc CREDITS MANIFESTO.txt USECASES
@@ -237,8 +222,7 @@ fi
 %{_bindir}/marble-qt
 %{_datadir}/applications/org.kde.marble-qt.desktop
 
-%post astro -p /sbin/ldconfig
-%postun astro -p /sbin/ldconfig
+%ldconfig_scriptlets astro
 
 %files astro
 %{_kde4_libdir}/libastro.so.1*
@@ -253,6 +237,8 @@ fi
 %files widget-data
 %{_datadir}/marble/data/
 
+%ldconfig_scriptlets widget-qt5
+
 %files widget-qt5
 %{_libdir}/libmarblewidget-qt5.so.28
 %{_libdir}/libmarblewidget-qt5.so.0.*