From 6cbf3ea3c957cce1d575d4494c1409c5eacd62bc Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Sep 03 2019 13:22:49 +0000
Subject: import kde-settings-19-23.10.el7_7


---

diff --git a/SOURCES/kde-settings-19-23-bz#1404382.patch b/SOURCES/kde-settings-19-23-bz#1404382.patch
index 9e819ab..55a9262 100644
--- a/SOURCES/kde-settings-19-23-bz#1404382.patch
+++ b/SOURCES/kde-settings-19-23-bz#1404382.patch
@@ -1,25 +1,25 @@
 diff --git a/etc/profile.d/kde.csh b/etc/profile.d/kde.csh
-index f690ca9..ca3eb8b 100755
+index f690ca9..7bf762f 100755
 --- a/etc/profile.d/kde.csh
 +++ b/etc/profile.d/kde.csh
 @@ -21,4 +21,9 @@ endif
  #endif
  end
- 
+
 +# Fix the user-places.xbel error pop at first user login
-+if [ ! -d ${HOME}/.local/share -a -w ${HOME} ] then
-+    mkdir -p ${HOME}/.local/share
++if ( ! -d "${HOME}/.local/share" && -w "${HOME}" ) then
++  mkdir -p "${HOME}/.local/share"
 +endif
 +
  unsetenv libdir
 diff --git a/etc/profile.d/kde.sh b/etc/profile.d/kde.sh
-index 679410f..797101a 100755
+index 679410f..df16705 100755
 --- a/etc/profile.d/kde.sh
 +++ b/etc/profile.d/kde.sh
 @@ -21,4 +21,9 @@ fi
  #fi
  done
- 
+
 +# Fix the user-places.xbel error pop at first user login
 +if [ ! -d $HOME/.local/share -a -w ${HOME} ]; then
 +    mkdir -p $HOME/.local/share
diff --git a/SOURCES/kde-settings-19-23-centos.patch b/SOURCES/kde-settings-19-23-centos.patch
deleted file mode 100644
index 4e36130..0000000
--- a/SOURCES/kde-settings-19-23-centos.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -up kde-settings-19-23/etc/kde/kdm/kdmrc.mikem kde-settings-19-23/etc/kde/kdm/kdmrc
---- kde-settings-19-23/etc/kde/kdm/kdmrc.mikem	2015-10-02 15:30:05.694279274 -0400
-+++ kde-settings-19-23/etc/kde/kdm/kdmrc	2015-10-02 15:27:56.452628712 -0400
-@@ -313,7 +313,7 @@ LogoPixmap=/usr/share/icons/hicolor/96x9
- # - %m -> the machine (hardware) type
- # - %% -> a single %
- # Default is "Welcome to %s at %n"
--GreetString=Red Hat Enterprise Linux
-+GreetString=CentOS
- # The font for the greeter headline.
- # Default is "charter,24,bold"
- GreetFont=Sans,16,-1,5,75,0,0,0,0,0
-@@ -443,7 +443,7 @@ AllowConsole=false
- UseTheme=true
- # The theme to use for the greeter. Can point to either a directory or an XML
- # file. Default is "/usr/share/kde4/apps/kdm/themes/circles"
--Theme=/usr/share/kde4/apps/kdm/themes/RHEL7
-+Theme=/usr/share/kde4/apps/kdm/themes/CentOS7
- # Set the widget color scheme 
- #ColorScheme=ObsidianCoast
- 
-diff -up kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/ksplashrc.mikem kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/ksplashrc
---- kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/ksplashrc.mikem	2015-10-02 15:30:38.750212975 -0400
-+++ kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/ksplashrc	2015-10-02 15:27:56.457628853 -0400
-@@ -1,2 +1,2 @@
- [KSplash]
--Theme=RHEL7
-+Theme=CentOS7
-diff -up kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/plasmarc.mikem kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/plasmarc
---- kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/plasmarc.mikem	2015-10-02 15:30:26.367863220 -0400
-+++ kde-settings-19-23/usr/share/kde-settings/kde-profile/default/share/config/plasmarc	2015-10-02 15:27:56.457628853 -0400
-@@ -1,2 +1,2 @@
- [Theme]
--name=RHEL7
-+name=CentOS7
diff --git a/SPECS/kde-settings.spec b/SPECS/kde-settings.spec
index 32a4846..a8231ae 100644
--- a/SPECS/kde-settings.spec
+++ b/SPECS/kde-settings.spec
@@ -1,5 +1,5 @@
 %global rel 23
-%global subrel 9
+%global subrel 10
 
 Summary: Config files for kde
 Name:    kde-settings
@@ -13,7 +13,6 @@ Source1: COPYING
 Patch0:  kde-settings-19-23-rhel.patch
 Patch1:  kde-settings-19-23-bz#1124472.patch
 Patch2:  kde-settings-19-23-bz#1404382.patch
-Patch3:  kde-settings-19-23-centos.patch
 
 BuildArch: noarch
 
@@ -93,7 +92,6 @@ Requires: pciutils
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 # Intentionally left blank.  Nothing to see here.
@@ -203,8 +201,9 @@ chmod 644  %{buildroot}%{_sysconfdir}/profile.d/kde.*
 
 
 %changelog
-* Tue Aug 06 2019 CentOS Sources <bugs@centos.org> - 19-23.9.el7.centos
-- debrand
+* Thu Aug 08 2019 Jan Grulich <jgrulich@redhat.com> - 19-23.10
+- Use correct tcsh syntax for config scripts
+  Resolves: bz#1738491
 
 * Mon Mar 18 2019 Jan Grulich <jgrulich@redhat.com> - 19-23.9
 - Check if we have write access to home directory before creating default folders