- updated to 1.24

[packages/connman.git] / connman.spec

diff --git a/connman.spec b/connman.spec
index d20a23bc4421fa87a32fb8ef0001b57d92e252f6..1861c166c8c8ea2d64f9e289f9f2324db917837c 100644 (file)
--- a/connman.spec
+++ b/connman.spec
@@ -1,30 +1,29 @@
-#
-# Conditional build:
-%bcond_without wimax           # Intel WiMAX support
-#
 Summary:       Connection Manager
 Summary(pl.UTF-8):     Zarządca połączeń
 Name:          connman
-Version:       1.10
+Version:       1.24
 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: dd6e1b4d9b9a28d127edb9f9b58bdec1
+Patch0:                %{name}-linux.patch
+URL:           https://connman.net/
 BuildRequires: dbus-devel >= 1.4
 BuildRequires: glib2-devel >= 1:2.28
 BuildRequires: gnutls-devel
-BuildRequires: iptables-devel
+BuildRequires: iptables-devel >= 1.4.11
 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
 Requires:      dbus >= 1.4
 Requires:      glib2 >= 1:2.28
+Requires:      iptables-libs >= 1.4.11
+Obsoletes:     connman-plugin-wimax
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                skip_post_check_so      libppp-plugin.so.*
@@ -52,20 +51,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,6 +65,7 @@ Pliki nagłówkowe dla wtyczek ConnMana.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure \
@@ -90,14 +76,12 @@ Pliki nagłówkowe dla wtyczek ConnMana.
        --disable-silent-rules \
        --enable-hh2serial-gps \
        --enable-iospm \
-       %{?with_wimax:--enable-iwmx} \
        --enable-l2tp \
        --enable-nmcompat \
        --enable-openconnect \
        --enable-openvpn \
        --enable-polkit \
        --enable-pptp \
-       --enable-threads \
        --enable-tist \
        --enable-vpnc \
        --with-openconnect=/usr/sbin/openconnect \
@@ -144,10 +128,8 @@ rm -rf $RPM_BUILD_ROOT
 /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
+%{_mandir}/man5/connman.conf.5*
+%{_mandir}/man8/connman.8*
 
 %files devel
 %defattr(644,root,root,755)