- updated to 1.42 (+missing file from git)

[packages/connman.git] / connman.spec

diff --git a/connman.spec b/connman.spec
index d9c0321cc74a74836f77c9eec6d7932aef2e2211..3211f3addfa9025dfac82b27e3fbf35ea535c090 100644 (file)
--- a/connman.spec
+++ b/connman.spec
@@ -5,16 +5,19 @@
 Summary:       Connection Manager
 Summary(pl.UTF-8):     Zarządca połączeń
 Name:          connman
-Version:       1.36
+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: dae77d9c904d2c223ae849e32079d57e
+# 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: libmnl-devel >= 1.0.0
+BuildRequires: openconnect-devel >= 8
 BuildRequires: pkgconfig
 BuildRequires: polkit-devel
 BuildRequires: ppp-plugin-devel
@@ -23,20 +26,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.28
-%if %{with nftables}
+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
+Obsoletes:     connman-plugin-wimax < 1.11
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                skip_post_check_so      libppp-plugin.so.*
@@ -78,10 +81,12 @@ Pliki nagłówkowe dla wtyczek ConnMana.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %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 +104,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 +116,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 +126,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 +143,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 +158,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*