update package

This commit is contained in:
19909236985 2020-08-01 18:29:10 +08:00
parent 5e36b0baaa
commit c187cf6754
3 changed files with 76 additions and 133 deletions

0
network-manager-applet-1.18.0.tar.xz Normal file → Executable file
View File

181
network-manager-applet.spec Normal file → Executable file
View File

@ -1,91 +1,73 @@
%global gtk3_version %(pkg-config --modversion gtk+-3.0 2>/dev/null || echo bad) %global gtk3_version %(pkg-config --modversion gtk+-3.0 2>/dev/null || echo bad)
%global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad) %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad)
%global nm_version 1:1.16.0
%global libnma_version 1.18.27
%global obsoletes_ver 1:0.9.7
%global rpm_version 1.18.0
%global real_version 1.18.0 %global real_version 1.18.0
%global release_version 1
%global real_version_major %(printf '%s' '%{real_version}' | sed -n 's/^\\([1-9][0-9]*\\.[1-9][0-9]*\\)\\.[1-9][0-9]*$/\\1/p')
%bcond_with libnm_gtk
Name: network-manager-applet Name: network-manager-applet
Version: 1.8.22 Summary: A network control and status applet for NetworkManager
Release: 2 Version: 1.18.0
Summary: NetworkManager GUI tools Release: 1
License: GPLv2+ License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager URL: http://www.gnome.org/projects/NetworkManager/
Source0: https://download.gnome.org/sources/network-manager-applet/1.18/%{name}-%{real_version}.tar.xz Obsoletes: NetworkManager-gnome < %{obsoletes_ver}
Patch1: 0001-nm-applet-no-notifications.patch
Requires: NetworkManager libnotify Source: https://download.gnome.org/sources/network-manager-applet/%{real_version_major}/%{name}-%{real_version}.tar.xz
Requires: libnma = %{version}-%{release}
Requires: nm-connection-editor = %{version}-%{release}
%if %{with libnm_gtk} Requires: NetworkManager >= %{nm_version}
BuildRequires: NetworkManager-devel Requires: libnotify >= 0.4.3
BuildRequires: NetworkManager-glib-devel Requires: nm-connection-editor%{?_isa} = %{version}-%{release}
%endif Requires: libnma%{?_isa} >= %{libnma_version}
BuildRequires: ModemManager-glib-devel NetworkManager-libnm-devel glib2-devel desktop-file-utils
BuildRequires: gettext-devel gobject-introspection-devel gtk-doc intltool meson gcr-devel gtk3-devel
BuildRequires: iso-codes-devel jansson-devel libgudev-devel libnotify-devel libsecret-devel libxslt
BuildRequires: libselinux-devel mobile-broadband-provider-info-devel pkgconfig /usr/bin/autopoint
BuildRequires: NetworkManager-libnm-devel >= %{nm_version}
BuildRequires: libnma-devel >= %{libnma_version}
BuildRequires: ModemManager-glib-devel >= 1.0
BuildRequires: glib2-devel >= 2.32
BuildRequires: gtk3-devel >= 3.10
BuildRequires: gobject-introspection-devel >= 0.10.3
BuildRequires: gettext-devel
BuildRequires: /usr/bin/autopoint
BuildRequires: pkgconfig
BuildRequires: libnotify-devel >= 0.4
BuildRequires: meson
BuildRequires: intltool
BuildRequires: gtk-doc
BuildRequires: desktop-file-utils
BuildRequires: iso-codes-devel
BuildRequires: libgudev1-devel >= 147
BuildRequires: libsecret-devel >= 0.12
BuildRequires: jansson-devel
BuildRequires: gcr-devel
BuildRequires: libselinux-devel
BuildRequires: mobile-broadband-provider-info-devel
BuildRequires: libappindicator-gtk3-devel
BuildRequires: libdbusmenu-gtk3-devel
%description %description
A network control and status applet for NetworkManager This package contains a network control and status notification area applet
for use with NetworkManager.
%package -n nm-connection-editor %package -n nm-connection-editor
Summary: A network connection configuration editor for NetworkManager Summary: A network connection configuration editor for NetworkManager
Requires: libnma%{?_isa} >= %{libnma_version}
%description -n nm-connection-editor %description -n nm-connection-editor
This package contains a network configuration editor and Bluetooth modem This package contains a network configuration editor and Bluetooth modem
utility for use with NetworkManager. utility for use with NetworkManager.
%package -n libnm-gtk
Summary: Private libraries for %{name}
Requires: gtk3 >= %{gtk3_version}
Requires: mobile-broadband-provider-info >= 0.20090602
Obsoletes: NetworkManager-gtk < 1:0.9.7
%description -n libnm-gtk
This package contains private libraries to be used only by nm-applet,
nm-connection editor, and the GNOME Control Center.
%package -n libnm-gtk-devel
Summary: Private header files for %{name}
Requires: NetworkManager-devel NetworkManager-glib-devel
Obsoletes: NetworkManager-gtk-devel < 1:0.9.7
Requires: libnm-gtk = %{version}-%{release}
Requires: gtk3-devel pkgconfig
%description -n libnm-gtk-devel
This package contains private header and pkg-config files to be used only by
GNOME control center.This package is obsoleted by libnma.
%package -n libnma
Summary: Private libraries for %{name}
Requires: gtk3 >= %{gtk3_version}
Requires: mobile-broadband-provider-info >= 0.20090602
Obsoletes: NetworkManager-gtk < 1:0.9.7
%description -n libnma
This package contains private libraries to be used only by nm-applet,
nm-connection editor, and the GNOME Control Center.
%package -n libnma-devel
Summary: Private header files for %{name}
Requires: NetworkManager-libnm-devel
Obsoletes: NetworkManager-gtk-devel < 1:0.9.7
Requires: libnma = %{version}-%{release}
Requires: gtk3-devel pkgconfig
%description -n libnma-devel
This package contains private header and pkg-config files to be used only by
nm-applet, nm-connection-editor, and the GNOME control center.
This package deprecates libnm-gtk.
%package_help
%prep %prep
%autosetup -p1 -n %{name}-%{real_version} %autosetup -n %{name}-%{real_version} -p1
%build %build
%meson \ %meson \
@ -108,74 +90,35 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
%check %check
%meson_test %meson_test
%ldconfig_scriptlets -n libnma
%ldconfig_scriptlets -n libnm-gtk
%files %files
%defattr(-,root,root)
%license COPYING
%doc NEWS CONTRIBUTING
%{_bindir}/nm-applet %{_bindir}/nm-applet
%{_datadir}/applications/nm-applet.desktop %{_datadir}/applications/nm-applet.desktop
%{_datadir}/icons/hicolor/22x22/apps/nm-s*.png
%{_datadir}/icons/hicolor/22x22/apps/nm-tech-*.png
%{_datadir}/icons/hicolor/22x22/apps/nm-vpn*.png
%{_datadir}/icons/hicolor/22x22/apps/nm-adhoc.png %{_datadir}/icons/hicolor/22x22/apps/nm-adhoc.png
%{_datadir}/icons/hicolor/22x22/apps/nm-wwan-tower.png
%{_datadir}/icons/hicolor/22x22/apps/nm-mb-roam.png %{_datadir}/icons/hicolor/22x22/apps/nm-mb-roam.png
%{_datadir}/icons/hicolor/22x22/apps/nm-secure-lock.png
%{_datadir}/icons/hicolor/22x22/apps/nm-signal-*.png
%{_datadir}/icons/hicolor/22x22/apps/nm-stage*-connecting*.png
%{_datadir}/icons/hicolor/22x22/apps/nm-tech-*.png
%{_datadir}/icons/hicolor/22x22/apps/nm-vpn-active-lock.png
%{_datadir}/icons/hicolor/22x22/apps/nm-vpn-connecting*.png
%{_datadir}/icons/hicolor/22x22/apps/nm-wwan-tower.png
%{_datadir}/GConf/gsettings/nm-applet.convert %{_datadir}/GConf/gsettings/nm-applet.convert
%{_sysconfdir}/xdg/autostart/nm-applet.desktop %{_sysconfdir}/xdg/autostart/nm-applet.desktop
%{_mandir}/man1/nm-applet*
%doc NEWS CONTRIBUTING
%license COPYING
%files -n nm-connection-editor -f %{name}.lang %files -n nm-connection-editor -f %{name}.lang
%defattr(-,root,root)
%{_bindir}/nm-connection-editor %{_bindir}/nm-connection-editor
%{_datadir}/applications/nm-connection-editor.desktop %{_datadir}/applications/nm-connection-editor.desktop
%{_datadir}/icons/hicolor/*/apps/nm-d* %{_datadir}/icons/hicolor/*/apps/nm-device-*.*
%{_datadir}/icons/hicolor/*/apps/nm-no-connection* %{_datadir}/icons/hicolor/*/apps/nm-no-connection.*
%{_datadir}/icons/hicolor/16x16/apps/nm-vpn-standalone-lock.png %{_datadir}/icons/hicolor/16x16/apps/nm-vpn-standalone-lock.png
%{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml
%{_datadir}/metainfo/nm-connection-editor.appdata.xml %{_datadir}/metainfo/nm-connection-editor.appdata.xml
%{_mandir}/man1/nm-connection-editor*
%dir %{_datadir}/gnome-vpn-properties %dir %{_datadir}/gnome-vpn-properties
%if %{with libnm_gtk}
%files -n libnm-gtk
%defattr(-,root,root)
%{_libdir}/libnm-gtk.so.*
%{_libdir}/girepository-1.0/NMGtk-1.0.typelib
%files -n libnm-gtk-devel
%defattr(-,root,root)
%{_includedir}/libnm-gtk/*.h
%{_libdir}/pkgconfig/libnm-gtk.pc
%{_libdir}/libnm-gtk.so
%{_datadir}/gir-1.0/NMGtk-1.0.gir
%endif
%files -n libnma
%defattr(-,root,root)
%{_libdir}/libnma.so.*
%{_libdir}/girepository-1.0/NMA-1.0.typelib
%files -n libnma-devel
%defattr(-,root,root)
%{_includedir}/libnma/*.h
%{_libdir}/pkgconfig/libnma.pc
%{_libdir}/libnma.so
%{_datadir}/gir-1.0/NMA-1.0.gir
%{_datadir}/gtk-doc
%files help
%defattr(-,root,root)
%{_mandir}/man1/nm-applet*
%{_mandir}/man1/nm-connection-editor*
%changelog %changelog
* Thu Nov 21 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.8.22-2 * Fri Jul 31 2020 wuchaochao <wuchaochao4@huawei.com> - 1.18.0-1
- Type:bugfix - Update to 1.18.0 release
- Id:NA
- SUG:NA
- DESC:add the libxslt in buildrequires
* Fri Sep 20 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.8.22-1
- Package init

0
network-manager-applet.yaml Normal file → Executable file
View File