X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=NetworkManager.spec;h=df334054d12bb9bff411788f4c54bf4e8b2db74b;hb=refs%2Fheads%2Fmaster;hp=b4d5d79838d3ada4ee9a9232cc353f784aada016;hpb=9e2c392815dadcb4ce7917830b81375a40fc073f;p=packages%2FNetworkManager.git

diff --git a/NetworkManager.spec b/NetworkManager.spec
index b4d5d79..cc1bc49 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -1,6 +1,7 @@
 # TODO: package /usr/lib/firewalld/zones/nm-shared.xml for firewalld support
 #
 # Conditional build
+%bcond_without	static_libs	# static library
 %bcond_without	systemd		# use systemd for session tracking instead of ConsoleKit (fallback to ConsoleKit on runtime)
 %bcond_without	vala		# Vala API
 %bcond_with	firewalld	# Firewalld zone for shared mode
@@ -9,13 +10,13 @@
 Summary:	Network Manager for GNOME
 Summary(pl.UTF-8):	Zarządca sieci dla GNOME
 Name:		NetworkManager
-Version:	1.42.6
+Version:	1.48.0
 Release:	1
 Epoch:		2
 License:	GPL v2+
 Group:		Networking/Admin
-Source0:	https://download.gnome.org/sources/NetworkManager/1.42/%{name}-%{version}.tar.xz
-# Source0-md5:	e2aa7bf567206a55b10f6b2e332c109e
+Source0:	https://download.gnome.org/sources/NetworkManager/1.48/%{name}-%{version}.tar.xz
+# Source0-md5:	ba52091831d0d68122933a494507986a
 Source1:	%{name}.conf
 Source3:	%{name}.tmpfiles
 Source4:	%{name}.init
@@ -31,7 +32,7 @@ BuildRequires:	curl-devel >= 7.24.0
 BuildRequires:	dbus-devel >= 1.1.0
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	gettext-tools >= 0.19.8
-BuildRequires:	glib2-devel >= 1:2.38.0
+BuildRequires:	glib2-devel >= 1:2.42
 BuildRequires:	gnome-common
 BuildRequires:	gobject-introspection-devel >= 0.10.0
 BuildRequires:	gtk-doc >= 1.0
@@ -51,7 +52,7 @@ BuildRequires:	nss-devel >= 3.11
 BuildRequires:	perl-base
 BuildRequires:	pkgconfig
 BuildRequires:	polkit-devel >= 0.97
-BuildRequires:	ppp-plugin-devel >= 3:2.4.6
+BuildRequires:	ppp-plugin-devel >= 3:2.4.9
 BuildRequires:	python3 >= 1:3
 BuildRequires:	python3-pygobject3
 BuildRequires:	readline-devel
@@ -82,11 +83,12 @@ Requires:	newt >= 0.52.15
 Requires:	polkit >= 0.97
 Requires:	rc-scripts >= 0.4.3.0
 Requires:	systemd-units >= 38
-Requires:	wpa_supplicant >= 0.7.3-4
 Suggests:	ModemManager >= 1.0.0
+%{?with_default_iwd:Suggests:	iwd}
 Suggests:	mobile-broadband-provider-info
 Suggests:	resolvconf
 Suggests:	teamd >= 1.9
+%{!?with_default_iwd:Suggests:	wpa_supplicant >= 0.7.3-4}
 Obsoletes:	NetworkManager-systemd < 2:0.9.2.0-5
 Obsoletes:	dhcdbd < 3.0-1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -117,7 +119,7 @@ Dokumentacja API biblioteki libnm.
 Summary:	Network Manager shared libraries
 Summary(pl.UTF-8):	Biblioteki dzielone Network Managera
 Group:		Libraries
-Requires:	glib2 >= 1:2.38.0
+Requires:	glib2 >= 1:2.42
 Requires:	nss >= 3.11
 Requires:	udev-libs >= 1:175
 Conflicts:	NetworkManager < 0.6.4-0.2
@@ -133,7 +135,7 @@ Summary:	Network Manager includes and more
 Summary(pl.UTF-8):	Pliki nagłówkowe Network Managera
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
-Requires:	glib2-devel >= 1:2.38.0
+Requires:	glib2-devel >= 1:2.42
 Requires:	libuuid-devel
 Requires:	nss-devel >= 3.11
 
@@ -191,10 +193,11 @@ Bashowe uzupełnianie nazw dla polecenia NetworkManagera (nmcli).
 grep -rl /usr/bin/env examples | xargs sed -i -e '1{
 	s,^#!.*bin/env gjs,#!/usr/bin/gjs,
 	s,^#!.*bin/env lua,#!%{__lua},
-	s,^#!.*bin/env python,#!%{__python},
+	s,^#!.*bin/env python,#!%{__python3},
 	s,^#!.*bin/env ruby,#!%{__ruby},
 }'
 
+%{__sed} -i -e '/^po\/Makefile\.in/d' configure.ac
 
 %build
 %{__gtkdocize}
@@ -205,11 +208,12 @@ grep -rl /usr/bin/env examples | xargs sed -i -e '1{
 %{__autoheader}
 %{__automake}
 %configure \
+	--disable-autotools-deprecation \
 	--enable-gtk-doc \
 	--enable-ifcfg-rh \
 	--enable-more-warnings \
 	--disable-silent-rules \
-	--enable-static \
+	%{__enable_disable static_libs static} \
 	%{!?with_vala:--disable-vala} \
 	--with-config-wifi-backend-default=%{?with_default_iwd:iwd}%{!?with_default_iwd:wpa_supplicant} \
 	--with-dhclient=/sbin/dhclient \
@@ -250,8 +254,12 @@ cp -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 
 # Cleanup
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
-%{__rm} $RPM_BUILD_ROOT%{distplugindir}/*.{a,la}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/pppd/plugins/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{distplugindir}/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/pppd/plugins/*.la
+%if %{with static_libs}
+%{__rm} $RPM_BUILD_ROOT%{distplugindir}/*.a
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/pppd/plugins/*.a
+%endif
 
 %find_lang %{name}
 
@@ -336,6 +344,8 @@ exit 0
 %{_prefix}/lib/NetworkManager/dispatcher.d/90-nm-cloud-setup.sh
 %dir %{_prefix}/lib/NetworkManager/dispatcher.d/no-wait.d
 %attr(755,root,root) %{_prefix}/lib/NetworkManager/dispatcher.d/no-wait.d/90-nm-cloud-setup.sh
+%dir %{_prefix}/lib/NetworkManager/dispatcher.d/pre-up.d
+%attr(755,root,root) %{_prefix}/lib/NetworkManager/dispatcher.d/pre-up.d/90-nm-cloud-setup.sh
 %{systemdunitdir}/NetworkManager.service
 %{systemdunitdir}/NetworkManager-dispatcher.service
 %{systemdunitdir}/NetworkManager-wait-online.service
@@ -409,9 +419,11 @@ exit 0
 %{_datadir}/dbus-1/interfaces/org.freedesktop.NetworkManager.*.xml
 %{_datadir}/gir-1.0/NM-1.0.gir
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libnm.a
+%endif
 
 %if %{with vala}
 %files -n vala-NetworkManager