From 42e2c420b478585ec75c41534df64be41b6344f5 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 06 2019 10:04:06 +0000 Subject: import kde-settings-19-23.9.el7 --- diff --git a/SOURCES/kde-settings-19-23-bz#1404382.patch b/SOURCES/kde-settings-19-23-bz#1404382.patch index 61e7a52..9e819ab 100644 --- a/SOURCES/kde-settings-19-23-bz#1404382.patch +++ b/SOURCES/kde-settings-19-23-bz#1404382.patch @@ -7,7 +7,7 @@ index f690ca9..ca3eb8b 100755 end +# Fix the user-places.xbel error pop at first user login -+if ( ! -d ${HOME}/.local/share ) then ++if [ ! -d ${HOME}/.local/share -a -w ${HOME} ] then + mkdir -p ${HOME}/.local/share +endif + @@ -21,7 +21,7 @@ index 679410f..797101a 100755 done +# Fix the user-places.xbel error pop at first user login -+if [ ! -d $HOME/.local/share ]; then ++if [ ! -d $HOME/.local/share -a -w ${HOME} ]; then + mkdir -p $HOME/.local/share +fi + 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 920eb62..3e8bff6 100644 --- a/SPECS/kde-settings.spec +++ b/SPECS/kde-settings.spec @@ -1,5 +1,5 @@ %global rel 23 -%global subrel 8 +%global subrel 9 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 Oct 30 2018 CentOS Sources - 19-23.8.el7.centos -- debrand +* Mon Mar 18 2019 Jan Grulich - 19-23.9 +- Check if we have write access to home directory before creating default folders + Resolves: bz#1579764 * Fri May 25 2018 Jan Grulich - 19-23.8 - Fix upstream URL