Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package deepin-network-utils for
openSUSE:Factory checked in at 2021-06-21 20:36:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/deepin-network-utils (Old)
and /work/SRC/openSUSE:Factory/.deepin-network-utils.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-network-utils"
Mon Jun 21 20:36:01 2021 rev:3 rq:901179 version:5.4.6
Changes:
--------
---
/work/SRC/openSUSE:Factory/deepin-network-utils/deepin-network-utils.changes
2021-06-02 22:11:03.500124946 +0200
+++
/work/SRC/openSUSE:Factory/.deepin-network-utils.new.2625/deepin-network-utils.changes
2021-06-21 20:36:28.254683705 +0200
@@ -1,0 +2,7 @@
+Tue Jun 8 17:00:09 UTC 2021 - Ferdinand Thiessen <[email protected]>
+
+- Update to version 5.4.6
+ * Fix compiler warnings
+- Use find_lang macro
+
+-------------------------------------------------------------------
Old:
----
dde-network-utils-5.4.5.tar.gz
New:
----
dde-network-utils-5.4.6.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deepin-network-utils.spec ++++++
--- /var/tmp/diff_new_pack.FxEL7X/_old 2021-06-21 20:36:28.722684298 +0200
+++ /var/tmp/diff_new_pack.FxEL7X/_new 2021-06-21 20:36:28.726684303 +0200
@@ -1,7 +1,7 @@
#
# spec file for package deepin-network-utils
#
-# Copyright (c) 2021 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2021 Hillwood Yang <[email protected]>
#
# All modifications and additions to the file contributed by third parties
@@ -13,19 +13,19 @@
# 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/
#
%define _name dde-network-utils
%define sover 1
Name: deepin-network-utils
-Version: 5.4.5
+Version: 5.4.6
Release: 0
License: GPL-3.0+
Summary: Deepin Network Utils
-Url: https://github.com/linuxdeepin/dde-network-utils
Group: Productivity/Networking/System
+URL: https://github.com/linuxdeepin/dde-network-utils
Source:
https://github.com/linuxdeepin/dde-network-utils/archive/%{version}/%{_name}-%{version}.tar.gz
BuildRequires: libqt5-qtbase-devel
BuildRequires: libqt5-qtdeclarative-devel
@@ -40,7 +40,6 @@
BuildRequires: pkgconfig(gio-qt)
BuildRequires: pkgconfig(gsettings-qt)
BuildRequires: cmake
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Deepin Network Utils is an application repackage the DBus data which is
provided
@@ -72,30 +71,36 @@
%build
%qmake5 PREFIX=%{_prefix} LIBDIR=%{_libdir}
-make %{?_smp_mflags}
+%make_build
%install
%qmake5_install
+%find_lang %{_name} --with-qt
%post -n lib%{_name}%{sover} -p /sbin/ldconfig
-
%postun -n lib%{_name}%{sover} -p /sbin/ldconfig
+# Please do not drop main package, the language package forcedly depends the
main package
%files
%defattr(-,root,root)
%doc README.md CHANGELOG.md
%license LICENSE
%files -n lib%{_name}%{sover}
-%defattr(-,root,root)
%{_libdir}/lib%{_name}.so.*
-%files lang
-%defattr(-,root,root)
-%{_datadir}/%{_name}
+%files lang -f %{_name}.lang
+%dir %{_datadir}/%{_name}
+%dir %{_datadir}/%{_name}/translations
+%{_datadir}/%{_name}/translations/dde-network-utils.qm
+# unusual languages, currently not correctly detected by find_lang
+%lang(ast) %{_datadir}/%{_name}/translations/dde-network-utils_ast.qm
+%lang(kab) %{_datadir}/%{_name}/translations/dde-network-utils_kab.qm
+%lang(pam) %{_datadir}/%{_name}/translations/dde-network-utils_pam.qm
%files devel
-%defattr(-,root,root)
+%license LICENSE
+%doc README.md CHANGELOG.md
%{_includedir}/libddenetworkutils
%{_libdir}/lib%{_name}.so
%{_libdir}/pkgconfig/%{_name}.pc
++++++ dde-network-utils-5.4.5.tar.gz -> dde-network-utils-5.4.6.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/dde-network-utils-5.4.5/dde-network-utils/networkworker.cpp
new/dde-network-utils-5.4.6/dde-network-utils/networkworker.cpp
--- old/dde-network-utils-5.4.5/dde-network-utils/networkworker.cpp
2021-03-11 04:10:37.000000000 +0100
+++ new/dde-network-utils-5.4.6/dde-network-utils/networkworker.cpp
2021-03-23 10:15:51.000000000 +0100
@@ -85,7 +85,7 @@
m_networkModel->onConnectionListChanged(m_networkInter.connections());
m_networkModel->onVPNEnabledChanged(m_networkInter.vpnEnabled());
m_networkModel->onActiveConnectionsChanged(m_networkInter.activeConnections());
- m_networkModel->onConnectivityChanged(m_networkInter.connectivity());
+
m_networkModel->onConnectivityChanged(static_cast<int>(m_networkInter.connectivity()));
queryActiveConnInfo();
@@ -223,7 +223,7 @@
void NetworkWorker::queryActiveConnInfo()
{
//????????????????????????????????????
- m_networkModel->onConnectivityChanged(m_networkInter.connectivity());
+
m_networkModel->onConnectivityChanged(static_cast<int>(m_networkInter.connectivity()));
QDBusPendingCallWatcher *w = new
QDBusPendingCallWatcher(m_networkInter.GetActiveConnectionInfo(), this);
@@ -232,6 +232,7 @@
void NetworkWorker::queryAccessPoints(const QString &devPath)
{
+ Q_UNUSED(devPath)
return;
}
