From dfd75c40c6bde803666a7a3b4581fb7e7aab90223a1ab9a7ab3eea4c7bbe607b Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Fri, 22 Dec 2017 07:53:33 +0000 Subject: [PATCH] - Remove kde_gtk_config.suse.sh as it's done by breeze-gtk's kconf_update script now OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kde-gtk-config5?expand=0&rev=145 --- kde-gtk-config5.changes | 6 ++++++ kde-gtk-config5.spec | 14 ++++-------- kde_gtk_config.suse.sh | 47 ----------------------------------------- 3 files changed, 10 insertions(+), 57 deletions(-) delete mode 100644 kde_gtk_config.suse.sh diff --git a/kde-gtk-config5.changes b/kde-gtk-config5.changes index 9fb1178..f179917 100644 --- a/kde-gtk-config5.changes +++ b/kde-gtk-config5.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Dec 22 07:46:58 UTC 2017 - fabian@ritter-vogt.de + +- Remove kde_gtk_config.suse.sh as it's done by breeze-gtk's + kconf_update script now + ------------------------------------------------------------------- Thu Nov 30 10:43:24 CET 2017 - fabian@ritter-vogt.de diff --git a/kde-gtk-config5.spec b/kde-gtk-config5.spec index 64c9dfd..dca60c1 100644 --- a/kde-gtk-config5.spec +++ b/kde-gtk-config5.spec @@ -24,9 +24,8 @@ Summary: KCM Module to Configure GTK2 and GTK3 Applications Appearance Un License: LGPL-3.0+ and GPL-3.0+ Group: System/GUI/KDE Url: http://projects.kde.org/kde-gtk-config -Source1: kde_gtk_config.suse.sh -Source2: gtkrc-2.0-kde4.template -Source3: gtk3-settings.ini-kde4.template +Source1: gtkrc-2.0-kde4.template +Source2: gtk3-settings.ini-kde4.template Source: http://download.kde.org/stable/plasma/%{version}/kde-gtk-config-%{version}.tar.xz BuildRequires: extra-cmake-modules >= 0.0.9 BuildRequires: kf5-filesystem @@ -48,7 +47,6 @@ Suggests: gtk2-metatheme-breeze Suggests: gtk3-metatheme-breeze Provides: kde-gtk-config = %{version} Obsoletes: kde-gtk-config < %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description kde-gtk-config is a KCM module to configure GTK2 and GTK3 applications @@ -96,16 +94,12 @@ the GTK3 application style from within the GTK configuration KCM %kf5_find_lang %endif -install -Dpm 0755 %{SOURCE1} %{buildroot}%{_kf5_configdir}/plasma-workspace/env/kde_gtk_config.suse.sh -install -Dpm 0644 %{SOURCE2} %{buildroot}%{_kf5_sharedir}/%{name}/gtkrc-2.0-kde4.template -install -Dpm 0644 %{SOURCE3} %{buildroot}%{_kf5_sharedir}/%{name}/gtk3-settings.ini-kde4.template +install -Dpm 0644 %{SOURCE1} %{buildroot}%{_kf5_sharedir}/%{name}/gtkrc-2.0-kde4.template +install -Dpm 0644 %{SOURCE2} %{buildroot}%{_kf5_sharedir}/%{name}/gtk3-settings.ini-kde4.template %files %defattr(-,root,root) %doc COPYING* -%dir %{_kf5_configdir}/plasma-workspace/env -%dir %{_kf5_configdir}/plasma-workspace -%config %{_kf5_configdir}/plasma-workspace/env/kde_gtk_config.suse.sh %{_kf5_sharedir}/%{name}/ %config %{_kf5_configdir}/cgctheme.knsrc %config %{_kf5_configdir}/cgcgtk3.knsrc diff --git a/kde_gtk_config.suse.sh b/kde_gtk_config.suse.sh deleted file mode 100644 index 4dec538..0000000 --- a/kde_gtk_config.suse.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash - -# Defaults for openSUSE -GTK2_SYSCONFDIR=/etc -GTK2_DATADIR=/usr/share/themes/ -GTK3_HOME_CONFDIR="$HOME/.config/gtk-3.0" -GTK3_DATADIR=/usr/share/themes/ - -# Files used by kde-gtk-config -GTK2_THEME_RC="$HOME/.gtkrc-2.0" -GTK3_THEME_RC="$HOME/.config/gtk-3.0/settings.ini" - -# GTK2 -if [ "$GTK2_RC_FILES" ]; then - export GTK2_RC_FILES="$GTK2_RC_FILES:$GTK2_THEME_RC" -else - export GTK2_RC_FILES="$GTK2_SYSCONFDIR/gtk-2.0/gtkrc:$GTK2_THEME_RC" -fi - -# Create the file if it doesn't exist -if [ ! -e "$GTK2_THEME_RC" ]; then - # Breeze, the default - if [ -e "$GTK2_DATADIR/Breeze/gtk-2.0/gtkrc" ] ; then - THEME="Breeze" - # else use QtCurve engine - elif [ -e "$GTK2_DATADIR/QtCurve/gtk-2.0/gtkrc" ] ; then - THEME="QtCurve" - fi - if [ -n "$THEME" ]; then - cp -f /usr/share/kde-gtk-config5/gtkrc-2.0-kde4.template "$GTK2_THEME_RC" - sed -i -e "s,@@THEME_NAME@@,$THEME," "$GTK2_THEME_RC" - fi -fi - -# GTK3 -# Create the file if it doesn't exist -if [ ! -e "$GTK3_THEME_RC" ]; then - # Breeze, the default - if [ -e "$GTK3_DATADIR/Breeze/gtk-3.0/gtk.css" ] ; then - THEME="Breeze" - fi - if [ -n "$THEME" ]; then - mkdir -p "$GTK3_HOME_CONFDIR" - cp -f /usr/share/kde-gtk-config5/gtk3-settings.ini-kde4.template "$GTK3_THEME_RC" - sed -i -e "s,@@THEME_NAME@@,$THEME," "$GTK3_THEME_RC" - fi -fi