Hello community,
here is the log from the commit of package yast2-control-center for
openSUSE:Factory checked in at 2019-07-31 14:17:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-control-center (Old)
and /work/SRC/openSUSE:Factory/.yast2-control-center.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-control-center"
Wed Jul 31 14:17:19 2019 rev:79 rq:707233 version:4.2.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/yast2-control-center/yast2-control-center.changes
2019-04-12 09:11:57.741603834 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-control-center.new.4126/yast2-control-center.changes
2019-07-31 14:17:21.062700581 +0200
@@ -1,0 +2,12 @@
+Fri May 31 13:34:19 UTC 2019 - Noah Davis <noaha...@gmail.com>
+
+- Display GenericName and Comment, not Name (boo#1084864)
+- 4.2.1
+
+-------------------------------------------------------------------
+Mon May 20 18:52:00 UTC 2019 - Stasiek Michalski <hel...@mailbox.org>
+
+- Change location of appdataa and fix it up (fate#319035)
+- 4.2.0
+
+-------------------------------------------------------------------
Old:
----
yast2-control-center-4.1.8.tar.bz2
New:
----
yast2-control-center-4.2.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-control-center.spec ++++++
--- /var/tmp/diff_new_pack.IYqLoJ/_old 2019-07-31 14:17:21.554700372 +0200
+++ /var/tmp/diff_new_pack.IYqLoJ/_new 2019-07-31 14:17:21.558700370 +0200
@@ -17,7 +17,7 @@
Name: yast2-control-center
-Version: 4.1.8
+Version: 4.2.1
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -97,7 +97,7 @@
make install DESTDIR=$RPM_BUILD_ROOT
cd ..
-%suse_update_desktop_file -G "Administrator Settings"
%{buildroot}%{_datadir}/applications/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
@@ -105,9 +105,9 @@
%files
%defattr(-,root,root)
-%dir %{_datadir}/appdata
-%{_datadir}/appdata/YaST.appdata.xml
-%{_datadir}/applications/YaST.desktop
+%dir %{_datadir}/metainfo
+%{_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
++++++ yast2-control-center-4.1.8.tar.bz2 -> yast2-control-center-4.2.1.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-control-center-4.1.8/package/yast2-control-center.changes
new/yast2-control-center-4.2.1/package/yast2-control-center.changes
--- old/yast2-control-center-4.1.8/package/yast2-control-center.changes
2019-04-09 11:21:41.000000000 +0200
+++ new/yast2-control-center-4.2.1/package/yast2-control-center.changes
2019-06-03 17:03:01.000000000 +0200
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Fri May 31 13:34:19 UTC 2019 - Noah Davis <noaha...@gmail.com>
+
+- Display GenericName and Comment, not Name (boo#1084864)
+- 4.2.1
+
+-------------------------------------------------------------------
+Mon May 20 18:52:00 UTC 2019 - Stasiek Michalski <hel...@mailbox.org>
+
+- Change location of appdataa and fix it up (fate#319035)
+- 4.2.0
+
+-------------------------------------------------------------------
Mon Apr 8 15:05:04 UTC 2019 - Stefan Hundhammer <shundham...@suse.com>
- Require libQt5Svg5 to support SVG icons (bsc#1127245)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-control-center-4.1.8/package/yast2-control-center.spec
new/yast2-control-center-4.2.1/package/yast2-control-center.spec
--- old/yast2-control-center-4.1.8/package/yast2-control-center.spec
2019-04-09 11:21:41.000000000 +0200
+++ new/yast2-control-center-4.2.1/package/yast2-control-center.spec
2019-06-03 17:03:01.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-control-center
-Version: 4.1.8
+Version: 4.2.1
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -97,7 +97,7 @@
make install DESTDIR=$RPM_BUILD_ROOT
cd ..
-%suse_update_desktop_file -G "Administrator Settings"
%{buildroot}%{_datadir}/applications/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
@@ -105,9 +105,9 @@
%files
%defattr(-,root,root)
-%dir %{_datadir}/appdata
-%{_datadir}/appdata/YaST.appdata.xml
-%{_datadir}/applications/YaST.desktop
+%dir %{_datadir}/metainfo
+%{_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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-control-center-4.1.8/src/CMakeLists.txt
new/yast2-control-center-4.2.1/src/CMakeLists.txt
--- old/yast2-control-center-4.1.8/src/CMakeLists.txt 2019-04-09
11:21:41.000000000 +0200
+++ new/yast2-control-center-4.2.1/src/CMakeLists.txt 2019-06-03
17:03:01.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 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 YaST.appdata.xml DESTINATION
${CMAKE_INSTALL_PREFIX}/share/appdata )
+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.1.8/src/YaST.appdata.xml
new/yast2-control-center-4.2.1/src/YaST.appdata.xml
--- old/yast2-control-center-4.1.8/src/YaST.appdata.xml 2019-04-09
11:21:41.000000000 +0200
+++ new/yast2-control-center-4.2.1/src/YaST.appdata.xml 1970-01-01
01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application>
- <id type="desktop">YaST.desktop</id>
- <metadata_license>CC0-1.0</metadata_license>
- <name>YaST</name>
- <summary>Configuration / Control center</summary>
- <description>
- <p>
- YaST is both an extremely flexible installer and a powerful control
center. It's an all-purpose tool for computing.
- </p>
- <p>
- A multitude of modules allows to flexibly extend the capabilities of
YaST.
- </p>
- </description>
- <screenshots>
- <screenshot
type="default">http://yast.github.io/assets/images/screenshots/screenshot_1.png</screenshot>
- </screenshots>
- <url type="homepage">http://yast.github.io/</url>
- <updatecontact>yast-de...@opensuse.org</updatecontact>
-</application>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-control-center-4.1.8/src/YaST.desktop
new/yast2-control-center-4.2.1/src/YaST.desktop
--- old/yast2-control-center-4.1.8/src/YaST.desktop 2019-04-09
11:21:41.000000000 +0200
+++ new/yast2-control-center-4.2.1/src/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.1.8/src/main_window.cpp
new/yast2-control-center-4.2.1/src/main_window.cpp
--- old/yast2-control-center-4.1.8/src/main_window.cpp 2019-04-09
11:21:41.000000000 +0200
+++ new/yast2-control-center-4.2.1/src/main_window.cpp 2019-06-03
17:03:01.000000000 +0200
@@ -255,7 +255,7 @@
return;
qDebug() << "Module Click:" << d->modmodel->data(srcidx).toString();
- qDebug() << "-> " << srcidx.row() << " : " <<
d->modmodel->propertyValue(srcidx, "GenericName").toString();
+ qDebug() << "-> " << srcidx.row() << " : " <<
d->modmodel->propertyValue(srcidx, "Comment").toString();
}
void MainWindow::slotLaunchModule( const QModelIndex &index)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-control-center-4.1.8/src/moduleiconitem.cpp
new/yast2-control-center-4.2.1/src/moduleiconitem.cpp
--- old/yast2-control-center-4.1.8/src/moduleiconitem.cpp 2019-04-09
11:21:41.000000000 +0200
+++ new/yast2-control-center-4.2.1/src/moduleiconitem.cpp 2019-06-03
17:03:01.000000000 +0200
@@ -76,7 +76,7 @@
newFont.setPointSize( option.font.pointSize() - 2);
QFontMetrics newFm = QFontMetrics( newFont );
- QString descr = newFm.elidedText( index.data(
YQModulesModel::GenericNameRole ).toString(), Qt::ElideRight,
option.rect.width() );
+ QString descr = newFm.elidedText( index.data(
YQModulesModel::CommentRole ).toString(), Qt::ElideRight, option.rect.width() );
QRect tr = option.rect;
tr.setTop( tr.top() + decorationSize.height() +
2*style->pixelMetric( QStyle::PM_FocusFrameVMargin) );
tr.setLeft( tr.left() + 2*style->pixelMetric(
QStyle::PM_FocusFrameHMargin ));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-control-center-4.1.8/src/org.openSUSE.YaST.appdata.xml
new/yast2-control-center-4.2.1/src/org.openSUSE.YaST.appdata.xml
--- old/yast2-control-center-4.1.8/src/org.openSUSE.YaST.appdata.xml
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-control-center-4.2.1/src/org.openSUSE.YaST.appdata.xml
2019-06-03 17:03:01.000000000 +0200
@@ -0,0 +1,24 @@
+<?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>yast-de...@opensuse.org</update_contact>
+</application>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-control-center-4.1.8/src/org.openSUSE.YaST.desktop
new/yast2-control-center-4.2.1/src/org.openSUSE.YaST.desktop
--- old/yast2-control-center-4.1.8/src/org.openSUSE.YaST.desktop
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-control-center-4.2.1/src/org.openSUSE.YaST.desktop
2019-06-03 17:03:01.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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-control-center-4.1.8/src/yqdesktopfilesmodel.cpp
new/yast2-control-center-4.2.1/src/yqdesktopfilesmodel.cpp
--- old/yast2-control-center-4.1.8/src/yqdesktopfilesmodel.cpp 2019-04-09
11:21:41.000000000 +0200
+++ new/yast2-control-center-4.2.1/src/yqdesktopfilesmodel.cpp 2019-06-03
17:03:01.000000000 +0200
@@ -299,7 +299,7 @@
// check the role and column
if ( role == Qt::DisplayRole )
{
- return translatedPropertyValue( index, "Name");
+ return translatedPropertyValue( index, "GenericName");
}
else if ( role == Qt::DecorationRole )
{
@@ -314,8 +314,10 @@
{
case Name:
return propertyValue( index, "Name" );
- case GenericName:
- return propertyValue ( index, "GenericName" );
+ case GenericName:
+ return propertyValue( index, "GenericName" );
+ case Comment:
+ return propertyValue ( index, "Comment" );
case Group:
return propertyValue( index, "X-SuSE-YaST-Group" );
case Icon:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-control-center-4.1.8/src/yqdesktopfilesmodel.h
new/yast2-control-center-4.2.1/src/yqdesktopfilesmodel.h
--- old/yast2-control-center-4.1.8/src/yqdesktopfilesmodel.h 2019-04-09
11:21:41.000000000 +0200
+++ new/yast2-control-center-4.2.1/src/yqdesktopfilesmodel.h 2019-06-03
17:03:01.000000000 +0200
@@ -56,6 +56,7 @@
{
Name,
GenericName,
+ Comment,
Group,
Icon,
SortKey,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-control-center-4.1.8/src/yqmodulesmodel.cpp
new/yast2-control-center-4.2.1/src/yqmodulesmodel.cpp
--- old/yast2-control-center-4.1.8/src/yqmodulesmodel.cpp 2019-04-09
11:21:41.000000000 +0200
+++ new/yast2-control-center-4.2.1/src/yqmodulesmodel.cpp 2019-06-03
17:03:01.000000000 +0200
@@ -82,7 +82,7 @@
PropertyMap data;
const QString rootOnly = "X-SuSE-YaST-RootOnly";
const QString group = "X-SuSE-YaST-Group";
- const QString name = "Name";
+ const QString name = "GenericName";
QSettings desktopFile( path, QSettings::IniFormat );
@@ -142,7 +142,7 @@
qDebug() << "Look up 1st module in group " << grpid;
QString firstMod = priv->groupStringCache[grpid];
- return indexForValue("Name", firstMod );
+ return indexForValue("GenericName", firstMod );
}
Qt::ItemFlags YQModulesModel::flags ( const QModelIndex & index ) const
@@ -187,10 +187,10 @@
{
return translatedPropertyValue( index, "X-SuSE-YaST-Keywords" );
}
- else if ( role == GenericNameRole )
+ else if ( role == CommentRole )
{
//QString tooltip = d->infoProvider.provideInfo( this, index );
- QString tooltip = translatedPropertyValue(index,
"GenericName").toString();
+ QString tooltip = translatedPropertyValue(index, "Comment").toString();
return tooltip;
}
else if ( role == Qt::DecorationRole )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-control-center-4.1.8/src/yqmodulesmodel.h
new/yast2-control-center-4.2.1/src/yqmodulesmodel.h
--- old/yast2-control-center-4.1.8/src/yqmodulesmodel.h 2019-04-09
11:21:41.000000000 +0200
+++ new/yast2-control-center-4.2.1/src/yqmodulesmodel.h 2019-06-03
17:03:01.000000000 +0200
@@ -42,7 +42,7 @@
enum UserRoleData
{
- GenericNameRole = 0x1BA81D0E
+ CommentRole = 0x1BA81D0E
};
YQModulesModel( QObject * parent = 0 );
