- unconditional noarch subpackages

[packages/NetworkManager.git] / NetworkManager.spec

diff --git a/NetworkManager.spec b/NetworkManager.spec
index 9b3d9b930880e800c83c903fe3002d1d5fd0e5fd..19db36325a064e0ac0b2166538ee74f3e9fe5737 100644 (file)
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -8,18 +8,19 @@
 Summary:       Network Manager for GNOME
 Summary(pl.UTF-8):     Zarządca sieci dla GNOME
 Name:          NetworkManager
-Version:       1.28.0
+Version:       1.30.0
 Release:       1
 Epoch:         2
 License:       GPL v2+
 Group:         Networking/Admin
-Source0:       https://download.gnome.org/sources/NetworkManager/1.28/%{name}-%{version}.tar.xz
-# Source0-md5: 3c4a70764ec3418a796b2c3f2a1f83e0
+Source0:       https://download.gnome.org/sources/NetworkManager/1.30/%{name}-%{version}.tar.xz
+# Source0-md5: dce168235c2b86ebc598d0e13e078ee3
 Source1:       %{name}.conf
 Source3:       %{name}.tmpfiles
 Source4:       %{name}.init
 Patch0:                ifcfg-path.patch
-Patch2:                systemd-fallback.patch
+Patch1:                systemd-fallback.patch
+Patch2:                iwd-segfault.patch
 URL:           https://wiki.gnome.org/Projects/NetworkManager
 BuildRequires: ModemManager-devel >= 1.0.0
 BuildRequires: audit-libs-devel
@@ -51,7 +52,7 @@ BuildRequires:        perl-base
 BuildRequires: pkgconfig
 BuildRequires: polkit-devel >= 0.97
 BuildRequires: ppp-plugin-devel >= 3:2.4.6
-BuildRequires: python3 >= 3
+BuildRequires: python3 >= 1:3
 BuildRequires: python3-pygobject3
 BuildRequires: readline-devel
 BuildRequires: rpmbuild(macros) >= 1.752
@@ -105,7 +106,7 @@ Summary:    libnm library API documentation
 Summary(pl.UTF-8):     Dokumentacja API biblioteki libnm
 Group:         Documentation
 Requires:      gtk-doc-common
-%{?noarchpackage}
+BuildArch:     noarch
 
 %description apidocs
 libnm library API documentation.
@@ -161,7 +162,7 @@ Summary(pl.UTF-8):  API języka Vala do bibliotek NetworkManagera
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 Requires:      vala >= 2:0.17.1.24
-%{?noarchpackage}
+BuildArch:     noarch
 
 %description -n vala-NetworkManager
 Vala API for NetworkManager libraries.
@@ -175,7 +176,7 @@ Summary(pl.UTF-8):  Bashowe uzupełnianie nazw dla polecenia NetworkManagera (nmc
 Group:         Applications/Shells
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      bash-completion >= 2.0
-%{?noarchpackage}
+BuildArch:     noarch
 
 %description -n bash-completion-NetworkManager
 Bash completion for NetworkManager command (nmcli).
@@ -186,7 +187,8 @@ Bashowe uzupełnianie nazw dla polecenia NetworkManagera (nmcli).
 %prep
 %setup -q
 %patch0 -p1
-%{?with_systemd:%patch2 -p1}
+%{?with_systemd:%patch1 -p1}
+%patch2 -p1
 
 grep -rl /usr/bin/env examples | xargs sed -i -e '1{
        s,^#!.*bin/env gjs,#!/usr/bin/gjs,
@@ -280,12 +282,13 @@ fi
 %triggerpostun -- NetworkManager < 2:0.9.2.0-5
 %systemd_trigger NetworkManager.service NetworkManager-wait-online.service
 
-%triggerun -- NetworkManager < 0.7.0-0.svn4027.1
-%service -q NetworkManagerDispatcher stop
-/sbin/chkconfig --del NetworkManagerDispatcher
-
 %triggerun -- NetworkManager < 0.8.9997-5
-# move network interfaces description files to new location
+# < 0.7.0-0.svn4027.1: disable obsolete service
+if /sbin/chkconfig --list | grep -q NetworkManagerDispatcher ; then
+       %service -q NetworkManagerDispatcher stop
+       /sbin/chkconfig --del NetworkManagerDispatcher
+fi
+# < 0.8.9997-5: move network interfaces description files to new location
 mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
 mv -f /etc/sysconfig/network-scripts/keys-* /etc/sysconfig/interfaces
 exit 0
@@ -376,6 +379,7 @@ exit 0
 %{_mandir}/man7/nm-openvswitch.7*
 %{_mandir}/man7/nmcli-examples.7*
 %{_mandir}/man8/NetworkManager.8*
+%{_mandir}/man8/nm-cloud-setup.8*
 %{_mandir}/man8/nm-initrd-generator.8*
 %{_examplesdir}/%{name}-%{version}