X-Git-Url: https://git.pld-linux.org/?p=packages%2Fconnman.git;a=blobdiff_plain;f=connman.spec;h=c856df047009db37c012edee2b1428bd145dc25d;hp=c5e2c575358126b29cba991d1b9639808fa63819;hb=939468286b1744b0ecebf31b701ed33934bef487;hpb=69d3f66fb998c8556863f5d6f71a43db5c03873c

diff --git a/connman.spec b/connman.spec
index c5e2c57..c856df0 100644
--- a/connman.spec
+++ b/connman.spec
@@ -5,16 +5,17 @@
 Summary:	Connection Manager
 Summary(pl.UTF-8):	Zarządca połączeń
 Name:		connman
-Version:	1.37
-Release:	2
+Version:	1.39
+Release:	1
 License:	GPL v2
 Group:		Networking/Daemons
 Source0:	https://www.kernel.org/pub/linux/network/connman/%{name}-%{version}.tar.xz
-# Source0-md5:	75012084f14fb63a84b116e66c6e94fb
+# Source0-md5:	b740a8859d1f0473fc76f8f590e4b57a
 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:	pkgconfig
 BuildRequires:	polkit-devel
 BuildRequires:	ppp-plugin-devel
@@ -23,20 +24,19 @@ 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
+%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.*
@@ -82,6 +82,7 @@ Pliki nagłówkowe dla wtyczek ConnMana.
 %build
 %configure \
 	IPTABLES_SAVE=/usr/sbin/iptables-save \
+	PPPD=/usr/sbin/pppd \
 	WPASUPPLICANT=/usr/sbin/wpa_supplicant \
 	--disable-silent-rules \
 	--enable-hh2serial-gps \
@@ -99,7 +100,6 @@ Pliki nagłówkowe dla wtyczek ConnMana.
 	--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}
@@ -112,7 +112,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 +122,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
@@ -135,10 +139,11 @@ 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
+%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
@@ -149,6 +154,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*