X-Git-Url: https://git.pld-linux.org/?p=packages%2Fconnman.git;a=blobdiff_plain;f=connman.spec;h=33d5c82b97aec6d1075cb07851bffda043ff2b39;hp=a744eb43ff2a3dace68751630e255fac8ff5520e;hb=6a6a8202f4ea7e1bd9588b601606ca019e8ccfcd;hpb=76d851020daeb5908a7bc250908aba8d560ff202

diff --git a/connman.spec b/connman.spec
index a744eb4..33d5c82 100644
--- a/connman.spec
+++ b/connman.spec
@@ -5,16 +5,18 @@
 Summary:	Connection Manager
 Summary(pl.UTF-8):	Zarządca połączeń
 Name:		connman
-Version:	1.38
+Version:	1.40
 Release:	1
 License:	GPL v2
 Group:		Networking/Daemons
 Source0:	https://www.kernel.org/pub/linux/network/connman/%{name}-%{version}.tar.xz
-# Source0-md5:	1ed8745354c7254bdfd4def54833ee94
+# Source0-md5:	32a0f82bd9bda1b00635e78e0cf45edf
 URL:		https://connman.net/
 BuildRequires:	dbus-devel >= 1.4
 BuildRequires:	glib2-devel >= 1:2.40
 BuildRequires:	gnutls-devel
+BuildRequires:	libmnl-devel >= 1.0.0
+BuildRequires:	openconnect-devel >= 8
 BuildRequires:	pkgconfig
 BuildRequires:	polkit-devel
 BuildRequires:	ppp-plugin-devel
@@ -23,20 +25,20 @@ 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.40
-%if %{with nftables}
 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
+Obsoletes:	connman-plugin-wimax < 1.11
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		skip_post_check_so	libppp-plugin.so.*
@@ -112,7 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/connman/{plugins,plugins-vpn,scripts}/*.la
 
-install -d $RPM_BUILD_ROOT/var/run/connman
+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
@@ -120,6 +124,8 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README TODO
+%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
@@ -150,6 +156,8 @@ rm -rf $RPM_BUILD_ROOT
 %{systemdunitdir}/connman-vpn.service
 %{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*