Merge pull request #34 from hellcp/master

Require yast2 on buildtime
yast · Nov 28, 2018 · 3c8145d · 3c8145d
2 parents 83a61cc + db1983f
commit 3c8145d
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git a/package/yast2-control-center.changes b/package/yast2-control-center.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Nov 28 12:56:19 UTC 2018 - Stasiek Michalski <hellcp@mailbox.org>
+
+- Use yast-control-center icon for desktop files (boo#1109310)
+
 -------------------------------------------------------------------
 Sun Nov 25 01:53:03 UTC 2018 - Stasiek Michalski <hellcp@mailbox.org>
 

diff --git a/package/yast2-control-center.spec b/package/yast2-control-center.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-control-center
-Version:        4.1.3
+Version:        4.1.4
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -36,8 +36,6 @@ BuildRequires:  pkgconfig(Qt5Widgets)
 Obsoletes:      yast2-control-center-gnome < %{version}
 Provides:       yast2-control-center-gnome = %{version}
 
-Requires:       yast2
-
 %if 0%{?force_gcc_46}
 BuildRequires:  gcc46
 BuildRequires:  gcc46-c++

diff --git a/src/YaST-systemsettings.desktop b/src/YaST-systemsettings.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Name=YaST
-Icon=yast
+Icon=yast-control-center
 GenericName=Administrator Settings
 Exec=kdesu -c /sbin/yast2
 X-KDE-System-Settings-Parent-Category=system-administration 

diff --git a/src/YaST.desktop b/src/YaST.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Categories=Settings;System;
 Name=YaST
-Icon=yast
+Icon=yast-control-center
 GenericName=Control Center
 Exec=/usr/bin/xdg-su -c /sbin/yast2
 Encoding=UTF-8

diff --git a/src/kde/kcmyast.desktop b/src/kde/kcmyast.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=kcmshell4 kcm_yast
-Icon=yast
+Icon=yast-control-center
 Type=Service
 X-DocPath=kcontrol/emoticons/index.html
 

diff --git a/src/main.cpp b/src/main.cpp
@@ -84,13 +84,13 @@ int main(int argc, char **argv)
 
     mainWin.setFullScreen ( fullscreen );
     mainWin.setNoBorder( noborder );
-    if (QIcon::hasThemeIcon("yast"))
+    if (QIcon::hasThemeIcon("yast-control-center"))
     {
-	mainWin.setWindowIcon( QIcon::fromTheme( "yast" ) );
+	mainWin.setWindowIcon( QIcon::fromTheme( "yast-control-center" ) );
     }
     else
     {
-	mainWin.setWindowIcon( QIcon::fromTheme( "yast-control-center" ) );
+	mainWin.setWindowIcon( QIcon::fromTheme( "yast" ) );
     }
 
     if ( fullscreen )