- updated to 1.23

[packages/connman.git] / connman.spec

diff --git a/connman.spec b/connman.spec
index 62430f2d2c37ea3affc2ee5d5aebc76d319b68e5..250e4c46b401f3301bde367c9ba45ecb4b41bf72 100644 (file)
--- a/connman.spec
+++ b/connman.spec
@@ -1,28 +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.2
+Version:       1.23
 Release:       1
 License:       GPL v2
 Group:         Networking/Daemons
-Source0:       http://www.kernel.org/pub/linux/network/connman/%{name}-%{version}.tar.xz
-# Source0-md5: 1468d5e68c1f80fe12b79f7fd0a854b5
-URL:           http://connman.net/
-BuildRequires: glib2-devel >= 1:2.28
+Source0:       https://www.kernel.org/pub/linux/network/connman/%{name}-%{version}.tar.xz
+# Source0-md5: f835b8137ab198e0af5deab043e2890a
+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.*
@@ -50,18 +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}
-
-%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
@@ -76,6 +65,7 @@ Pliki nagłówkowe dla wtyczek ConnMana.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure \
@@ -86,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 \
@@ -107,7 +95,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/connman/{plugins,scripts}/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/connman/{plugins,plugins-vpn,scripts}/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -116,28 +104,32 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README TODO
 %attr(755,root,root) %{_sbindir}/connmand
+%attr(755,root,root) %{_sbindir}/connman-vpnd
 %dir %{_libdir}/connman
 %dir %{_libdir}/connman/plugins
 %attr(755,root,root) %{_libdir}/connman/plugins/hh2serial-gps.so
 %attr(755,root,root) %{_libdir}/connman/plugins/iospm.so
-%attr(755,root,root) %{_libdir}/connman/plugins/l2tp.so
-%attr(755,root,root) %{_libdir}/connman/plugins/openconnect.so
-%attr(755,root,root) %{_libdir}/connman/plugins/openvpn.so
-%attr(755,root,root) %{_libdir}/connman/plugins/pptp.so
 %attr(755,root,root) %{_libdir}/connman/plugins/tist.so
-%attr(755,root,root) %{_libdir}/connman/plugins/vpnc.so
+%dir %{_libdir}/connman/plugins-vpn
+%attr(755,root,root) %{_libdir}/connman/plugins-vpn/l2tp.so
+%attr(755,root,root) %{_libdir}/connman/plugins-vpn/openconnect.so
+%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
 %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
+/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
-
-%files plugin-wimax
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/connman/plugins/iwmxsdk.so
+%{systemdunitdir}/connman-vpn.service
+%{_mandir}/man5/connman.conf.5*
+%{_mandir}/man8/connman.8*
 
 %files devel
 %defattr(644,root,root,755)