From 02b2e48867ba2fcaa139560a7220209666ba6a00 Mon Sep 17 00:00:00 2001
From: raveit65 <mate@raveit.de>
Date: Mon, 19 Mar 2018 08:49:40 +0100
Subject: [PATCH] update to 1.18.3

---
 .gitignore                |  1 +
 mate-settings-daemon.spec | 37 ++++++++++++++-----------------------
 sources                   |  2 +-
 3 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index ff44c10..3198af6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@
 /mate-settings-daemon-1.18.0.tar.xz
 /mate-settings-daemon-1.18.1.tar.xz
 /mate-settings-daemon-1.18.2.tar.xz
+/mate-settings-daemon-1.18.3.tar.xz
diff --git a/mate-settings-daemon.spec b/mate-settings-daemon.spec
index 90fa10c..64e4278 100644
--- a/mate-settings-daemon.spec
+++ b/mate-settings-daemon.spec
@@ -13,7 +13,7 @@
 %{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz}
 
 Name:           mate-settings-daemon
-Version:        %{branch}.2
+Version:        %{branch}.3
 %if 0%{?rel_build}
 Release:        1%{?dist}
 %else
@@ -29,8 +29,10 @@ URL:            http://mate-desktop.org
 # Source for snapshot-builds.
 %{!?rel_build:Source0:    http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}}
 
+%if 0%{?rhel}
 # fix rhbz (#1140329)
 Patch0:         mate-settings-daemon_fix-xrdb-plugin-for-rhel.patch
+%endif
 
 BuildRequires:  dbus-glib-devel
 BuildRequires:  dconf-devel
@@ -67,10 +69,10 @@ various parameters of a MATE session and the applications that run
 under it.
 
 %prep
-%setup -q%{!?rel_build:n %{name}-%{commit}}
-
-%if 0%{?rhel}
-%patch0 -p1 -b .xrdb
+%if 0%{?rel_build}
+%autosetup -p1
+%else
+%autosetup -n %{name}-%{commit} -p1
 %endif
 
 %if 0%{?rel_build}
@@ -101,24 +103,8 @@ desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/mate-settings-dae
 
 %find_lang %{name} --with-gnome --all-name
 
-%post
-/sbin/ldconfig
-/bin/touch --no-create %{_datadir}/icons/mate &> /dev/null || :
-/bin/touch --no-create %{_datadir}/hicolor/mate &> /dev/null || :
-
-%postun
-/sbin/ldconfig
-if [ $1 -eq 0 ] ; then
-    /bin/touch --no-create %{_datadir}/icons/mate &> /dev/null || :
-    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/mate &> /dev/null || :
-    /usr/bin/gtk-update-icon-cache %{_datadir}/hicolor/mate &> /dev/null || :
-    /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
-fi
-
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/mate &> /dev/null || :
-/usr/bin/gtk-update-icon-cache %{_datadir}/hicolor/mate &> /dev/null || :
-/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 
 %files -f %{name}.lang
@@ -148,6 +134,11 @@ fi
 
 
 %changelog
+* Mon Mar 19 2018 Wolfgang Ulbrich <fedora@raveit.de> - 1.18.3-1
+- update to  1.18.3
+- drop obsolete scriptlets
+- switch to using autosetup
+
 * Tue Oct 24 2017 Wolfgang Ulbrich <fedora@raveit.de> - 1.18.2-1
  -update to 1.18.2
 
diff --git a/sources b/sources
index 20117e2..faa872b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mate-settings-daemon-1.18.2.tar.xz) = 2e07f7873d8f1e75391ae6ab7a132ce1f90a3afe661ca263fff9db1b68c0a02dc53255d6382c2d69861f997f22711d062e43468041a0b3476cdd3a051dec7039
+SHA512 (mate-settings-daemon-1.18.3.tar.xz) = ed250d3e871fefa490f4125a77505570682f787cc8b0d8d270eee145ddb55bfca88b7f685e35c6131c8ad6840573eb9fd66de16dab8d74442caff022f6d747f2