- updated to 1.42 (+missing file from git)

[packages/connman.git] / connman.spec

diff --git a/connman.spec b/connman.spec
index bb394e3b1aefdc630808a3196654d8ea7371ba45..3211f3addfa9025dfac82b27e3fbf35ea535c090 100644 (file)
--- a/connman.spec
+++ b/connman.spec
@@ -1,18 +1,23 @@
+#
+# Conditional build:
+%bcond_with    nftables        # nftables instead of iptables
+
 Summary:       Connection Manager
 Summary(pl.UTF-8):     Zarządca połączeń
 Name:          connman
-Version:       1.21
+Version:       1.42
 Release:       1
 License:       GPL v2
 Group:         Networking/Daemons
 Source0:       https://www.kernel.org/pub/linux/network/connman/%{name}-%{version}.tar.xz
-# Source0-md5: 483633162b819c8b99fec970f92e311d
-Patch0:                %{name}-linux.patch
+# 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 >= 1.4.11
+BuildRequires: libmnl-devel >= 1.0.0
+BuildRequires: openconnect-devel >= 8
 BuildRequires: pkgconfig
 BuildRequires: polkit-devel
 BuildRequires: ppp-plugin-devel
@@ -20,10 +25,21 @@ BuildRequires:      readline-devel
 BuildRequires: systemd-devel
 BuildRequires: tar >= 1:1.22
 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
-Obsoletes:     connman-plugin-wimax
+%endif
+Obsoletes:     connman-plugin-wimax < 1.11
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                skip_post_check_so      libppp-plugin.so.*
@@ -69,24 +85,26 @@ Pliki nagłówkowe dla wtyczek ConnMana.
 
 %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 \
+       --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}
 
@@ -98,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
@@ -117,20 +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
+%{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)