X-Git-Url: https://git.pld-linux.org/?p=packages%2Fconnman.git;a=blobdiff_plain;f=connman.spec;h=c5e2c575358126b29cba991d1b9639808fa63819;hp=153e4277eec35f5a29129ef0f83ad6f8df938627;hb=69d3f66;hpb=5d30a47f79e1a69ca1ba5c0e56d246632d2f1794

diff --git a/connman.spec b/connman.spec
index 153e427..c5e2c57 100644
--- a/connman.spec
+++ b/connman.spec
@@ -1,26 +1,41 @@
+#
+# Conditional build:
+%bcond_with	nftables	# nftables instead of iptables
+
 Summary:	Connection Manager
 Summary(pl.UTF-8):	Zarządca połączeń
 Name:		connman
-Version:	1.12
-Release:	1
+Version:	1.37
+Release:	2
 License:	GPL v2
 Group:		Networking/Daemons
-Source0:	http://www.kernel.org/pub/linux/network/connman/%{name}-%{version}.tar.xz
-# Source0-md5:	6386d04ccbfd66c68e94ae7a8859a3a4
-Patch0:		%{name}-linux.patch
-URL:		http://connman.net/
+Source0:	https://www.kernel.org/pub/linux/network/connman/%{name}-%{version}.tar.xz
+# Source0-md5:	75012084f14fb63a84b116e66c6e94fb
+URL:		https://connman.net/
 BuildRequires:	dbus-devel >= 1.4
-BuildRequires:	glib2-devel >= 1:2.28
+BuildRequires:	glib2-devel >= 1:2.40
 BuildRequires:	gnutls-devel
-BuildRequires:	iptables-devel
 BuildRequires:	pkgconfig
 BuildRequires:	polkit-devel
 BuildRequires:	ppp-plugin-devel
+BuildRequires:	readline-devel
 BuildRequires:	systemd-devel
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
+%if %{with nftables}
+BuildRequires:	libmnl-devel >= 1.0.0
+BuildRequires:	libnftnl-devel >= 1.0.4
+%else
+BuildRequires:	iptables-devel >= 1.4.11
+%endif
 Requires:	dbus >= 1.4
-Requires:	glib2 >= 1:2.28
+Requires:	glib2 >= 1:2.40
+%if %{with nftables}
+Requires:	libmnl >= 1.0.0
+Requires:	libnftnl >= 1.0.4
+%else
+Requires:	iptables-libs >= 1.4.11
+%endif
 Obsoletes:	connman-plugin-wimax
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -63,28 +78,29 @@ Pliki nagłówkowe dla wtyczek ConnMana.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure \
-	L2TP=/usr/sbin/xl2tpd \
-	PPPD=/usr/sbin/pppd \
-	PPTP=/usr/sbin/pptp \
+	IPTABLES_SAVE=/usr/sbin/iptables-save \
 	WPASUPPLICANT=/usr/sbin/wpa_supplicant \
 	--disable-silent-rules \
 	--enable-hh2serial-gps \
 	--enable-iospm \
+	--enable-iwd \
 	--enable-l2tp \
 	--enable-nmcompat \
 	--enable-openconnect \
 	--enable-openvpn \
 	--enable-polkit \
 	--enable-pptp \
-	--enable-threads \
 	--enable-tist \
 	--enable-vpnc \
+	%{?with_nftables:--with-firewall=nftables} \
+	--with-l2tp=/usr/sbin/xl2tpd \
 	--with-openconnect=/usr/sbin/openconnect \
 	--with-openvpn=/usr/sbin/openvpn \
+	--with-pppd=/usr/sbin/pppd \
+	--with-pptp=/usr/sbin/pptp \
 	--with-vpnc=/usr/bin/vpnc
 %{__make}
 
@@ -96,14 +112,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/connman/{plugins,plugins-vpn,scripts}/*.la
 
+install -d $RPM_BUILD_ROOT/var/run/connman
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README TODO
-%attr(755,root,root) %{_sbindir}/connmand
+%attr(755,root,root) %{_bindir}/connmanctl
 %attr(755,root,root) %{_sbindir}/connman-vpnd
+%attr(755,root,root) %{_sbindir}/connmand
+%attr(755,root,root) %{_sbindir}/connmand-wait-online
 %dir %{_libdir}/connman
 %dir %{_libdir}/connman/plugins
 %attr(755,root,root) %{_libdir}/connman/plugins/hh2serial-gps.so
@@ -119,14 +139,24 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/connman/scripts/libppp-plugin.so*
 %attr(755,root,root) %{_libdir}/connman/scripts/openconnect-script
 %attr(755,root,root) %{_libdir}/connman/scripts/openvpn-script
-/etc/dbus-1/system.d/connman.conf
-/etc/dbus-1/system.d/connman-nmcompat.conf
-/etc/dbus-1/system.d/connman-vpn-dbus.conf
+/usr/share/dbus-1/system.d/connman.conf
+/usr/share/dbus-1/system.d/connman-nmcompat.conf
+/usr/share/dbus-1/system.d/connman-vpn-dbus.conf
 /usr/share/dbus-1/system-services/net.connman.vpn.service
 /usr/share/polkit-1/actions/net.connman.policy
 /usr/share/polkit-1/actions/net.connman.vpn.policy
 %{systemdunitdir}/connman.service
 %{systemdunitdir}/connman-vpn.service
+%{systemdunitdir}/connman-wait-online.service
+%{systemdtmpfilesdir}/connman_resolvconf.conf
+%dir /var/run/connman
+%{_mandir}/man1/connmanctl.1*
+%{_mandir}/man5/connman.conf.5*
+%{_mandir}/man5/connman-service.config.5*
+%{_mandir}/man5/connman-vpn.conf.5*
+%{_mandir}/man5/connman-vpn-provider.config.5*
+%{_mandir}/man8/connman.8*
+%{_mandir}/man8/connman-vpn.8*
 
 %files devel
 %defattr(644,root,root,755)