Hello community,
here is the log from the commit of package yast2-control-center for
openSUSE:Factory checked in at 2019-09-23 13:15:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-control-center (Old)
and /work/SRC/openSUSE:Factory/.yast2-control-center.new.7948 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-control-center"
Mon Sep 23 13:15:58 2019 rev:80 rq:730537 version:4.2.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/yast2-control-center/yast2-control-center.changes
2019-07-31 14:17:21.062700581 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-control-center.new.7948/yast2-control-center.changes
2019-09-23 13:16:01.077120027 +0200
@@ -1,0 +2,6 @@
+Tue Sep 10 22:23:37 UTC 2019 - Stasiek Michalski <[email protected]>
+
+- Fix appdata for new spec (fate#319035)
+- 4.2.2
+
+-------------------------------------------------------------------
Old:
----
yast2-control-center-4.2.1.tar.bz2
New:
----
yast2-control-center-4.2.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-control-center.spec ++++++
--- /var/tmp/diff_new_pack.iALqdm/_old 2019-09-23 13:16:01.501119951 +0200
+++ /var/tmp/diff_new_pack.iALqdm/_new 2019-09-23 13:16:01.501119951 +0200
@@ -17,11 +17,15 @@
Name: yast2-control-center
-Version: 4.2.1
+Version: 4.2.2
Release: 0
+Url: https://github.com/yast/yast-control-center
+Summary: YaST2 - Control Center
+License: GPL-2.0-only
+Group: System/YaST
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-control-center-%{version}.tar.bz2
+
BuildRequires: cmake
BuildRequires: libdrm-devel
BuildRequires: libjpeg-devel
@@ -31,11 +35,6 @@
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Widgets)
-
-# control-center-gnome is dropped and this one should be used instead
-Obsoletes: yast2-control-center-gnome < %{version}
-Provides: yast2-control-center-gnome = %{version}
-
%if 0%{?force_gcc_46}
BuildRequires: gcc46
BuildRequires: gcc46-c++
@@ -43,37 +42,36 @@
BuildRequires: gcc-c++ >= 4.6
%endif
-Url: https://github.com/yast/yast-control-center
-Summary: YaST2 - Control Center
-License: GPL-2.0-only
-Group: System/YaST
Requires: yast2
Requires: yast2-control-center-binary
+# control-center-gnome is dropped and this one should be used instead
+Obsoletes: yast2-control-center-gnome < %{version}
+Provides: yast2-control-center-gnome = %{version}
+
%description
This package contains the menu selection component for YaST2.
%package qt
Summary: YaST2 - Control Center (Qt Version)
Group: System/YaST
-Requires: yast2-control-center
-Provides: yast2-control-center-binary
-Provides: yast2-control-center:%{_prefix}/lib/YaST2/bin/y2controlcenter
-Requires: libyui-qt
+Requires: libyui-qt
+Requires: yast2-control-center
# bsc#1130700: Need Qt SVG support for icons
Requires: libQt5Svg5
-Supplements: kdebase3
-Supplements: kdebase4-session
-Supplements: plasma5-session
+Provides: yast2-control-center-binary
+Provides: yast2-control-center:%{_prefix}/lib/YaST2/bin/y2controlcenter
+
+Supplements: (yast2 and plasma5-session)
%description qt
This package contains the menu selection component for YaST2 using the
Qt toolkit.
%prep
-%setup
+%setup -q
%build
mkdir build
@@ -94,20 +92,16 @@
%install
cd build
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
cd ..
-%suse_update_desktop_file -G "Administrator Settings"
%{buildroot}%{_datadir}/applications/org.openSUSE.YaST.desktop Core-System
X-SuSE-ControlCenter-System X-GNOME-SystemSettings
+%suse_update_desktop_file -G "Administrator Settings"
%{buildroot}%{_datadir}/applications/org.opensuse.YaST.desktop Core-System
X-SuSE-ControlCenter-System X-GNOME-SystemSettings
%suse_update_desktop_file
%{buildroot}%{_datadir}/kde4/services/YaST-systemsettings.desktop
-%clean
-rm -rf "$RPM_BUILD_ROOT"
-
%files
-%defattr(-,root,root)
%dir %{_datadir}/metainfo
-%{_datadir}/metainfo/org.openSUSE.YaST.appdata.xml
-%{_datadir}/applications/org.openSUSE.YaST.desktop
+%{_datadir}/metainfo/org.opensuse.YaST.appdata.xml
+%{_datadir}/applications/org.opensuse.YaST.desktop
%dir %{_datadir}/kde4/
%dir %{_datadir}/kde4/services
%{_datadir}/kde4/services/YaST-systemsettings.desktop
@@ -116,8 +110,7 @@
%{yast_icondir}
%files qt
-%defattr(-,root,root)
-%{_prefix}/lib/YaST2/bin/y2controlcenter
+%{_libexecdir}/YaST2/bin/y2controlcenter
%license COPYING.GPL2
%changelog
++++++ yast2-control-center-4.2.1.tar.bz2 -> yast2-control-center-4.2.2.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-control-center-4.2.1/package/yast2-control-center.changes
new/yast2-control-center-4.2.2/package/yast2-control-center.changes
--- old/yast2-control-center-4.2.1/package/yast2-control-center.changes
2019-06-03 17:03:01.000000000 +0200
+++ new/yast2-control-center-4.2.2/package/yast2-control-center.changes
2019-09-13 09:43:37.000000000 +0200
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Sep 10 22:23:37 UTC 2019 - Stasiek Michalski <[email protected]>
+
+- Fix appdata for new spec (fate#319035)
+- 4.2.2
+
+-------------------------------------------------------------------
Fri May 31 13:34:19 UTC 2019 - Noah Davis <[email protected]>
- Display GenericName and Comment, not Name (boo#1084864)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-control-center-4.2.1/package/yast2-control-center.spec
new/yast2-control-center-4.2.2/package/yast2-control-center.spec
--- old/yast2-control-center-4.2.1/package/yast2-control-center.spec
2019-06-03 17:03:01.000000000 +0200
+++ new/yast2-control-center-4.2.2/package/yast2-control-center.spec
2019-09-13 09:43:37.000000000 +0200
@@ -12,16 +12,20 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: yast2-control-center
-Version: 4.2.1
+Version: 4.2.2
Release: 0
+Url: https://github.com/yast/yast-control-center
+Summary: YaST2 - Control Center
+License: GPL-2.0-only
+Group: System/YaST
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-control-center-%{version}.tar.bz2
+
BuildRequires: cmake
BuildRequires: libdrm-devel
BuildRequires: libjpeg-devel
@@ -31,11 +35,6 @@
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Widgets)
-
-# control-center-gnome is dropped and this one should be used instead
-Obsoletes: yast2-control-center-gnome < %{version}
-Provides: yast2-control-center-gnome = %{version}
-
%if 0%{?force_gcc_46}
BuildRequires: gcc46
BuildRequires: gcc46-c++
@@ -43,37 +42,36 @@
BuildRequires: gcc-c++ >= 4.6
%endif
-Url: https://github.com/yast/yast-control-center
-Summary: YaST2 - Control Center
-License: GPL-2.0-only
-Group: System/YaST
Requires: yast2
Requires: yast2-control-center-binary
+# control-center-gnome is dropped and this one should be used instead
+Obsoletes: yast2-control-center-gnome < %{version}
+Provides: yast2-control-center-gnome = %{version}
+
%description
This package contains the menu selection component for YaST2.
%package qt
Summary: YaST2 - Control Center (Qt Version)
Group: System/YaST
+
Requires: yast2-control-center
-Provides: yast2-control-center-binary
-Provides: yast2-control-center:%{_prefix}/lib/YaST2/bin/y2controlcenter
Requires: libyui-qt
-
# bsc#1130700: Need Qt SVG support for icons
Requires: libQt5Svg5
-Supplements: kdebase3
-Supplements: kdebase4-session
-Supplements: plasma5-session
+Provides: yast2-control-center-binary
+Provides: yast2-control-center:%{_prefix}/lib/YaST2/bin/y2controlcenter
+
+Supplements: (yast2 and plasma5-session)
%description qt
This package contains the menu selection component for YaST2 using the
Qt toolkit.
%prep
-%setup
+%setup -q
%build
mkdir build
@@ -94,20 +92,16 @@
%install
cd build
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
cd ..
-%suse_update_desktop_file -G "Administrator Settings"
%{buildroot}%{_datadir}/applications/org.openSUSE.YaST.desktop Core-System
X-SuSE-ControlCenter-System X-GNOME-SystemSettings
-%suse_update_desktop_file
%{buildroot}%{_datadir}/kde4/services/YaST-systemsettings.desktop
-
-%clean
-rm -rf "$RPM_BUILD_ROOT"
+%suse_update_desktop_file -G "Administrator Settings"
%{buildroot}%{_datadir}/applications/org.opensuse.YaST.desktop Core-System
X-SuSE-ControlCenter-System X-GNOME-SystemSettings
+%suse_update_desktop_file
%{buildroot}%{_datadir}/kde4/services/YaST-systemsettings.desktop
%files
-%defattr(-,root,root)
%dir %{_datadir}/metainfo
-%{_datadir}/metainfo/org.openSUSE.YaST.appdata.xml
-%{_datadir}/applications/org.openSUSE.YaST.desktop
+%{_datadir}/metainfo/org.opensuse.YaST.appdata.xml
+%{_datadir}/applications/org.opensuse.YaST.desktop
%dir %{_datadir}/kde4/
%dir %{_datadir}/kde4/services
%{_datadir}/kde4/services/YaST-systemsettings.desktop
@@ -116,8 +110,7 @@
%{yast_icondir}
%files qt
-%defattr(-,root,root)
-%{_prefix}/lib/YaST2/bin/y2controlcenter
+%{_libexecdir}/YaST2/bin/y2controlcenter
%license COPYING.GPL2
%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-control-center-4.2.1/src/CMakeLists.txt
new/yast2-control-center-4.2.2/src/CMakeLists.txt
--- old/yast2-control-center-4.2.1/src/CMakeLists.txt 2019-06-03
17:03:01.000000000 +0200
+++ new/yast2-control-center-4.2.2/src/CMakeLists.txt 2019-09-13
09:43:37.000000000 +0200
@@ -58,10 +58,10 @@
INSTALL(TARGETS y2controlcenter DESTINATION
${CMAKE_INSTALL_PREFIX}/lib/YaST2/bin)
INSTALL(DIRECTORY icons DESTINATION ${CMAKE_INSTALL_PREFIX}/share/ )
-INSTALL(FILES org.openSUSE.YaST.desktop DESTINATION
${CMAKE_INSTALL_PREFIX}/share/applications )
+INSTALL(FILES org.opensuse.YaST.desktop DESTINATION
${CMAKE_INSTALL_PREFIX}/share/applications )
INSTALL(FILES YaST-systemsettings.desktop DESTINATION
${CMAKE_INSTALL_PREFIX}/share/kde4/services )
INSTALL(FILES YaST-systemsettings.desktop DESTINATION
${CMAKE_INSTALL_PREFIX}/share/kservices5 )
-INSTALL(FILES org.openSUSE.YaST.appdata.xml DESTINATION
${CMAKE_INSTALL_PREFIX}/share/metainfo )
+INSTALL(FILES org.opensuse.YaST.appdata.xml DESTINATION
${CMAKE_INSTALL_PREFIX}/share/metainfo )
SET(MODELS_TEST_SRCS
models_test.cpp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-control-center-4.2.1/src/main.cpp
new/yast2-control-center-4.2.2/src/main.cpp
--- old/yast2-control-center-4.2.1/src/main.cpp 2019-06-03 17:03:01.000000000
+0200
+++ new/yast2-control-center-4.2.2/src/main.cpp 2019-09-13 09:43:37.000000000
+0200
@@ -54,6 +54,8 @@
QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
QApplication app(argc, argv);
+ app.setApplicationName("org.opensuse.YaST");
+ app.setDesktopFileName("org.opensuse.YaST.desktop");
set_textdomain("control-center");
bool fullscreen = false;
@@ -85,14 +87,6 @@
mainWin.setFullScreen ( fullscreen );
mainWin.setNoBorder( noborder );
- if (QIcon::hasThemeIcon("yast-control-center"))
- {
- mainWin.setWindowIcon( QIcon::fromTheme( "yast-control-center" ) );
- }
- else
- {
- mainWin.setWindowIcon( QIcon::fromTheme( "yast" ) );
- }
if ( fullscreen )
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-control-center-4.2.1/src/main_window.cpp
new/yast2-control-center-4.2.2/src/main_window.cpp
--- old/yast2-control-center-4.2.1/src/main_window.cpp 2019-06-03
17:03:01.000000000 +0200
+++ new/yast2-control-center-4.2.2/src/main_window.cpp 2019-09-13
09:43:37.000000000 +0200
@@ -416,7 +416,6 @@
}
}
setWindowTitle( title );
- QCoreApplication::setApplicationName( title );
}
void MainWindow::closeEvent (QCloseEvent *event)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-control-center-4.2.1/src/org.openSUSE.YaST.appdata.xml
new/yast2-control-center-4.2.2/src/org.openSUSE.YaST.appdata.xml
--- old/yast2-control-center-4.2.1/src/org.openSUSE.YaST.appdata.xml
2019-06-03 17:03:01.000000000 +0200
+++ new/yast2-control-center-4.2.2/src/org.openSUSE.YaST.appdata.xml
1970-01-01 01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application>
- <id>org.openSUSE.YaST</id>
- <launchable type="desktop-id">org.openSUSE.YaST.desktop</launchable>
- <metadata_license>GPL-2.0</metadata_license>
- <project_license>GPL-2.0</project_license>
- <name>YaST</name>
- <summary>Configuration and System Management Software</summary>
- <description>
- <p>YaST is both an extremely flexible installer and a powerful control
center. It's an all-purpose tool for system management.</p>
- <p>A multitude of modules allows to flexibly extend the capabilities of
YaST.</p>
- </description>
- <categories>
- <category>Settings</category>
- <category>HardwareSettings</category>
- <category>DesktopSettings</category>
- </categories>
- <screenshots>
- <screenshot
type="default">http://yast.opensuse.org/assets/images/screenshots/screenshot_1.png</screenshot>
- </screenshots>
- <url type="homepage">http://yast.opensuse.org/</url>
- <url type="bugtracker">https://bugzilla.opensuse.org/</url>
- <update_contact>[email protected]</update_contact>
-</application>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-control-center-4.2.1/src/org.openSUSE.YaST.desktop
new/yast2-control-center-4.2.2/src/org.openSUSE.YaST.desktop
--- old/yast2-control-center-4.2.1/src/org.openSUSE.YaST.desktop
2019-06-03 17:03:01.000000000 +0200
+++ new/yast2-control-center-4.2.2/src/org.openSUSE.YaST.desktop
1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Categories=Settings;System;
-Name=YaST
-Icon=yast-control-center
-GenericName=Control Center
-Exec=/usr/bin/xdg-su -c /sbin/yast2
-Encoding=UTF-8
-Comment=Manage system-wide settings
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-control-center-4.2.1/src/org.opensuse.YaST.appdata.xml
new/yast2-control-center-4.2.2/src/org.opensuse.YaST.appdata.xml
--- old/yast2-control-center-4.2.1/src/org.opensuse.YaST.appdata.xml
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-control-center-4.2.2/src/org.opensuse.YaST.appdata.xml
2019-09-13 09:43:37.000000000 +0200
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application"
xmlns="https://specifications.freedesktop.org/metainfo/1.0";>
+ <id>org.opensuse.YaST.desktop</id>
+ <launchable type="desktop-id">org.opensuse.YaST.desktop</launchable>
+ <metadata_license>GPL-2.0</metadata_license>
+ <project_license>GPL-2.0</project_license>
+ <name>YaST</name>
+ <summary>Configuration and System Management Software</summary>
+ <description>
+ <p>YaST is both an extremely flexible installer and a powerful control
center. It's an all-purpose tool for system management.</p>
+ <p>A multitude of modules allows to flexibly extend the capabilities of
YaST.</p>
+ </description>
+ <categories>
+ <category>Settings</category>
+ <category>HardwareSettings</category>
+ <category>DesktopSettings</category>
+ </categories>
+ <screenshots>
+ <screenshot
type="default">http://yast.opensuse.org/assets/images/screenshots/screenshot_1.png</screenshot>
+ </screenshots>
+ <url type="homepage">http://yast.opensuse.org/</url>
+ <url type="bugtracker">https://bugzilla.opensuse.org/</url>
+ <update_contact>[email protected]</update_contact>
+</component>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-control-center-4.2.1/src/org.opensuse.YaST.desktop
new/yast2-control-center-4.2.2/src/org.opensuse.YaST.desktop
--- old/yast2-control-center-4.2.1/src/org.opensuse.YaST.desktop
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-control-center-4.2.2/src/org.opensuse.YaST.desktop
2019-09-13 09:43:37.000000000 +0200
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Categories=Settings;System;
+Name=YaST
+Icon=yast-control-center
+GenericName=Control Center
+Exec=/usr/bin/xdg-su -c /sbin/yast2
+Encoding=UTF-8
+Comment=Manage system-wide settings
