!29 fix file conflicts and remove old tar

From: @zhouwenpei 
Reviewed-by: @seuzw 
Signed-off-by: @seuzw
This commit is contained in:
openeuler-ci-bot 2023-02-14 06:21:26 +00:00 committed by Gitee
commit a7f522ef0f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 5 additions and 2 deletions

Binary file not shown.

View File

@ -9,7 +9,7 @@
Name: network-manager-applet
Summary: A network control and status applet for NetworkManager
Version: 1.30.0
Release: 1
Release: 2
License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/
Obsoletes: NetworkManager-gnome < %{obsoletes_ver}
@ -88,7 +88,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
%{_datadir}/icons/hicolor/22x22/apps/nm-vpn-connecting*.png
%{_datadir}/icons/hicolor/22x22/apps/nm-wwan-tower.png
%{_datadir}/icons/hicolor/scalable/apps/*.svg
%{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml
%exclude %{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml
%{_datadir}/GConf/gsettings/nm-applet.convert
%{_sysconfdir}/xdg/autostart/nm-applet.desktop
@ -110,6 +110,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
%{_datadir}/metainfo/nm-connection-editor.appdata.xml
%changelog
* Tue Feb 14 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 1.30.0-2
- fix file conflicts and remove old tar
* Tue Feb 07 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 1.30.0-1
- update to 1.30.0