diff --git a/0001-nm-applet-no-notifications.patch b/0001-nm-applet-no-notifications.patch deleted file mode 100644 index be6b6bf7fce98542bcad094ce412e07acbfd3f48..0000000000000000000000000000000000000000 --- a/0001-nm-applet-no-notifications.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/org.gnome.nm-applet.gschema.xml.in b/org.gnome.nm-applet.gschema.xml.in -index 9e2887e..4f8c16a 100644 ---- a/org.gnome.nm-applet.gschema.xml.in -+++ b/org.gnome.nm-applet.gschema.xml.in -@@ -17,7 +17,7 @@ - Set this to true to disable notifications when connecting to or disconnecting from a VPN. - - -- false -+ true - Suppress networks available notifications - Set this to true to disable notifications when Wi-Fi networks are available. - diff --git a/network-manager-applet-1.18.0.tar.xz b/network-manager-applet-1.18.0.tar.xz new file mode 100755 index 0000000000000000000000000000000000000000..ac05a726f0be5160aabaac065fdf2956c308372d Binary files /dev/null and b/network-manager-applet-1.18.0.tar.xz differ diff --git a/network-manager-applet-1.8.22.tar.xz b/network-manager-applet-1.8.22.tar.xz deleted file mode 100644 index 25e7db13ac5e6dd2805dd389a8b077f32916e926..0000000000000000000000000000000000000000 Binary files a/network-manager-applet-1.8.22.tar.xz and /dev/null differ diff --git a/network-manager-applet.spec b/network-manager-applet.spec old mode 100644 new mode 100755 index 1a6ca24c052712d0b5164fdeb4e4808cd7c61216..266446ec37b1d069057c1a3edfa7d2cdedbb7e64 --- a/network-manager-applet.spec +++ b/network-manager-applet.spec @@ -1,104 +1,57 @@ %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 real_version 1.8.22 - -%bcond_with libnm_gtk - -Name: network-manager-applet -Version: 1.8.22 -Release: 2 -Summary: NetworkManager GUI tools -License: GPLv2+ -URL: http://www.gnome.org/projects/NetworkManager -Source0: https://download.gnome.org/sources/network-manager-applet/1.8/%{name}-%{real_version}.tar.xz -Patch1: 0001-nm-applet-no-notifications.patch - -Requires: NetworkManager libnotify -Requires: libnma = %{version}-%{release} -Requires: nm-connection-editor = %{version}-%{release} - -%if %{with libnm_gtk} -BuildRequires: NetworkManager-devel -BuildRequires: NetworkManager-glib-devel -%endif -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 - +%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 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') + +Name: network-manager-applet +Summary: A network control and status applet for NetworkManager +Version: 1.18.0 +Release: 1 +License: GPLv2+ +URL: http://www.gnome.org/projects/NetworkManager/ +Obsoletes: NetworkManager-gnome < %{obsoletes_ver} + +Source: https://download.gnome.org/sources/network-manager-applet/%{real_version_major}/%{name}-%{real_version}.tar.xz + +Requires: NetworkManager >= %{nm_version} libnotify >= 0.4.3 nm-connection-editor libnma + +BuildRequires: NetworkManager-libnm-devel >= %{nm_version} libnma-devel ModemManager-glib-devel >= 1.0 glib2-devel >= 2.32 gtk3-devel >= 3.10 +BuildRequires: gobject-introspection-devel >= 0.10.3 gettext-devel pkgconfig libnotify-devel >= 0.4 meson intltool gtk-doc +BuildRequires: /usr/bin/autopoint mobile-broadband-provider-info-devel libselinux-devel libappindicator-gtk3-devel libdbusmenu-gtk3-devel +BuildRequires: desktop-file-utils iso-codes-devel libgudev1-devel >= 147 libsecret-devel >= 0.12 jansson-devel gcr-devel %description -A network control and status applet for NetworkManager - -%package -n nm-connection-editor +This package contains a network control and status notification area applet +for use with NetworkManager. + +%package -n nm-connection-editor Summary: A network connection configuration editor for NetworkManager - -%description -n nm-connection-editor +Requires: libnma + +%description -n nm-connection-editor This package contains a network configuration editor and Bluetooth modem 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 -%autosetup -p1 -n %{name}-%{real_version} +%prep +%autosetup -n %{name}-%{real_version} -p1 + %build -%meson -Dgcr=true -Dselinux=true \ -%if %{with libnm_gtk} - -Dlibnm_gtk=true -%else - -Dlibnm_gtk=false -%endif +%meson \ + -Dgcr=true \ + -Dselinux=true \ + -Ddisable-static=true \ + -Dappindicator=yes %meson_build - %install %meson_install -install -d $RPM_BUILD_ROOT%{_datadir}/gnome-vpn-properties +mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome-vpn-properties %find_lang nm-applet cat nm-applet.lang >> %{name}.lang @@ -108,63 +61,34 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit %check %meson_test - -%ldconfig_scriptlets -n libnma -%ldconfig_scriptlets -n libnm-gtk - + %files %defattr(-,root,root) -%license COPYING %doc NEWS CONTRIBUTING +%license COPYING %{_bindir}/nm-applet %{_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-wwan-tower.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 %{_sysconfdir}/xdg/autostart/nm-applet.desktop - -%files -n nm-connection-editor -f %{name}.lang + +%files -n nm-connection-editor -f %{name}.lang %defattr(-,root,root) %{_bindir}/nm-connection-editor %{_datadir}/applications/nm-connection-editor.desktop -%{_datadir}/icons/hicolor/*/apps/nm-d* -%{_datadir}/icons/hicolor/*/apps/nm-no-connection* +%{_datadir}/icons/hicolor/*/apps/nm-device-*.* +%{_datadir}/icons/hicolor/*/apps/nm-no-connection.* %{_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 %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) @@ -172,11 +96,5 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit %{_mandir}/man1/nm-connection-editor* %changelog -* Thu Nov 21 2019 openEuler Buildteam - 1.8.22-2 -- Type:bugfix -- Id:NA -- SUG:NA -- DESC:add the libxslt in buildrequires - -* Fri Sep 20 2019 openEuler Buildteam - 1.8.22-1 -- Package init +* Fri Jul 31 2020 wuchaochao - 1.18.0-1 +- Update to 1.18.0 release \ No newline at end of file diff --git a/network-manager-applet.yaml b/network-manager-applet.yaml old mode 100644 new mode 100755