X-Git-Url: https://git.pld-linux.org/?p=packages%2Fconnman.git;a=blobdiff_plain;f=connman.spec;h=7b5285be8cd883e89e8c9f05a4f5fdb3805ab740;hp=d20a23bc4421fa87a32fb8ef0001b57d92e252f6;hb=HEAD;hpb=b63eb8d90fec93c3f129658fd11a4cc5ffab026f

diff --git a/connman.spec b/connman.spec
index d20a23b..3211f3a 100644
--- a/connman.spec
+++ b/connman.spec
@@ -1,30 +1,45 @@
 #
 # Conditional build:
-%bcond_without	wimax		# Intel WiMAX support
-#
+%bcond_with	nftables	# nftables instead of iptables
+
 Summary:	Connection Manager
 Summary(pl.UTF-8):	Zarządca połączeń
 Name:		connman
-Version:	1.10
+Version:	1.42
 Release:	1
 License:	GPL v2
 Group:		Networking/Daemons
-Source0:	http://www.kernel.org/pub/linux/network/connman/%{name}-%{version}.tar.xz
-# Source0-md5:	e20b8f0b5c6b7437b7544e278f3070ad
-URL:		http://connman.net/
+Source0:	https://www.kernel.org/pub/linux/network/connman/%{name}-%{version}.tar.xz
+# Source0-md5:	09856b27a39a8ff8b739fe41894cc231
+Patch0:		%{name}-missing.patch
+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:	libmnl-devel >= 1.0.0
+BuildRequires:	openconnect-devel >= 8
 BuildRequires:	pkgconfig
 BuildRequires:	polkit-devel
 BuildRequires:	ppp-plugin-devel
+BuildRequires:	readline-devel
 BuildRequires:	systemd-devel
 BuildRequires:	tar >= 1:1.22
-%{?with_wimax:BuildRequires:	wimax-devel}
 BuildRequires:	xz
+%if %{with nftables}
+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
+Requires:	libmnl >= 1.0.0
+Requires:	openconnect >= 8
+%if %{with nftables}
+Requires:	libnftnl >= 1.0.4
+%else
+Requires:	iptables-libs >= 1.4.11
+%endif
+Obsoletes:	connman-plugin-wimax < 1.11
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		skip_post_check_so	libppp-plugin.so.*
@@ -52,20 +67,6 @@ rozwiązywanie nazw domenowych, także są implementowane poprzez
 wtyczki. Takie podejście do wtyczek pozwala na łatwe adaptowanie i
 modyfikowanie pod kątem różnych przypadków użycia.
 
-%package plugin-wimax
-Summary:	WiMAX plugin for ConnMan
-Summary(pl.UTF-8):	Wtyczka WiMAX dla ConnMana
-Group:		Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	dbus-devel >= 1.4
-Requires:	glib2-devel >= 1:2.28
-
-%description plugin-wimax
-WiMAX plugin for ConnMan.
-
-%description plugin-wimax -l pl.UTF-8
-Wtyczka WiMAX dla ConnMana.
-
 %package devel
 Summary:	Header files for ConnMan plugins
 Summary(pl.UTF-8):	Pliki nagłówkowe dla wtyczek ConnMana
@@ -80,28 +81,30 @@ Pliki nagłówkowe dla wtyczek ConnMana.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure \
-	L2TP=/usr/sbin/xl2tpd \
+	IPTABLES_SAVE=/usr/sbin/iptables-save \
 	PPPD=/usr/sbin/pppd \
-	PPTP=/usr/sbin/pptp \
 	WPASUPPLICANT=/usr/sbin/wpa_supplicant \
 	--disable-silent-rules \
 	--enable-hh2serial-gps \
 	--enable-iospm \
-	%{?with_wimax:--enable-iwmx} \
+	--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-pptp=/usr/sbin/pptp \
 	--with-vpnc=/usr/bin/vpnc
 %{__make}
 
@@ -113,14 +116,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/connman/{plugins,plugins-vpn,scripts}/*.la
 
+install -d $RPM_BUILD_ROOT/var/{lib/connman{,-vpn},run/connman}
+
+install -D src/main.conf $RPM_BUILD_ROOT%{_sysconfdir}/connman/main.conf
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README TODO
-%attr(755,root,root) %{_sbindir}/connmand
+%dir %{_sysconfdir}/connman
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/connman/main.conf
+%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
@@ -132,22 +143,31 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/connman/plugins-vpn/openvpn.so
 %attr(755,root,root) %{_libdir}/connman/plugins-vpn/pptp.so
 %attr(755,root,root) %{_libdir}/connman/plugins-vpn/vpnc.so
+%attr(755,root,root) %{_libdir}/connman/plugins-vpn/wireguard.so
 %dir %{_libdir}/connman/scripts
 %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
+%attr(755,root,root) %{_libdir}/connman/scripts/vpn-script
+/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
-
-%files plugin-wimax
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/connman/plugins/iwmxsdk.so
+%{systemdunitdir}/connman-wait-online.service
+%{systemdtmpfilesdir}/connman_resolvconf.conf
+%dir /var/lib/connman
+%dir /var/lib/connman-vpn
+%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)