X-Git-Url: https://git.pld-linux.org/?p=packages%2Fconnman.git;a=blobdiff_plain;f=connman.spec;h=67f102632af0ba64d307cc5c4dd3ff7ce52e2167;hp=be197cdad280a06e6f84da3d38184c7608590f56;hb=7a66d92;hpb=f070bc36c8f7100af3fa5dbf035b243c0f2613cd

diff --git a/connman.spec b/connman.spec
index be197cd..67f1026 100644
--- 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.9
-Release:	1
+Version:	1.33
+Release:	4
 License:	GPL v2
 Group:		Networking/Daemons
-Source0:	http://www.kernel.org/pub/linux/network/connman/%{name}-%{version}.tar.xz
-# Source0-md5:	ba27f49c9d94bc2c885c9423fd4fc7bd
-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:	c51903fd3e7a6a371d12ac5d72a1fa01
+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,9 @@ 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
+
+install -d $RPM_BUILD_ROOT/var/run/connman
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -115,29 +105,43 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README TODO
+%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
 %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
+%{systemdunitdir}/connman-wait-online.service
+%{systemdtmpfilesdir}/connman_resolvconf.conf
+%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)