change spec

network-manager-applet.spec

@@ -1,18 +1,13 @@
 %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 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 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
@@ -23,49 +18,27 @@ 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}
+Requires: NetworkManager >= %{nm_version} libnotify >= 0.4.3 nm-connection-editor libnma
-Requires: libnotify >= 0.4.3
+
-Requires: nm-connection-editor%{?_isa} = %{version}-%{release}
+BuildRequires: NetworkManager-libnm-devel >= %{nm_version} libnma-devel ModemManager-glib-devel >= 1.0 glib2-devel >= 2.32 gtk3-devel >= 3.10
-Requires: libnma%{?_isa} >= %{libnma_version}
+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: NetworkManager-libnm-devel >= %{nm_version}
+BuildRequires: desktop-file-utils iso-codes-devel libgudev1-devel >= 147 libsecret-devel >= 0.12 jansson-devel gcr-devel
-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
 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
-Requires: libnma%{?_isa} >= %{libnma_version}
+Requires: libnma
  
 %description -n nm-connection-editor
 This package contains a network configuration editor and Bluetooth modem
 utility for use with NetworkManager.
- 
+
- 
+%package_help
+
 %prep
 %autosetup -n %{name}-%{real_version} -p1
  
@@ -83,7 +56,6 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome-vpn-properties
 %find_lang nm-applet
 cat nm-applet.lang >> %{name}.lang
  
-# validate .desktop and autostart files
 desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/nm-applet.desktop
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-editor.desktop
  
@@ -91,6 +63,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
 %meson_test
  
 %files
+%defattr(-,root,root)
+%doc NEWS CONTRIBUTING
+%license COPYING
 %{_bindir}/nm-applet
 %{_datadir}/applications/nm-applet.desktop
 %{_datadir}/icons/hicolor/22x22/apps/nm-adhoc.png
@@ -104,21 +79,22 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
 %{_datadir}/icons/hicolor/22x22/apps/nm-wwan-tower.png
 %{_datadir}/GConf/gsettings/nm-applet.convert
 %{_sysconfdir}/xdg/autostart/nm-applet.desktop
-%{_mandir}/man1/nm-applet*
+
-%doc NEWS CONTRIBUTING
-%license COPYING
- 
 %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-device-*.*
 %{_datadir}/icons/hicolor/*/apps/nm-no-connection.*
 %{_datadir}/icons/hicolor/16x16/apps/nm-vpn-standalone-lock.png
 %{_datadir}/metainfo/nm-connection-editor.appdata.xml
-%{_mandir}/man1/nm-connection-editor*
 %dir %{_datadir}/gnome-vpn-properties
- 
+
- 
+%files      help
+%defattr(-,root,root)
+%{_mandir}/man1/nm-applet*
+%{_mandir}/man1/nm-connection-editor*
+
 %changelog
 * Fri Jul  31 2020 wuchaochao <wuchaochao4@huawei.com> - 1.18.0-1
-- Update to 1.18.0 release 
+- Update to 1.18.0 release