up to 1.10.2

[packages/NetworkManager.git] / NetworkManager.spec

diff --git a/NetworkManager.spec b/NetworkManager.spec
index 1c37e5d12b9b95bcf53080268ac787a25526f28e..6200b83fcb11d766486ab1e6087ab88ee21d8497 100644 (file)
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -6,13 +6,13 @@
 Summary:       Network Manager for GNOME
 Summary(pl.UTF-8):     Zarządca sieci dla GNOME
 Name:          NetworkManager
-Version:       1.6.0
+Version:       1.10.2
 Release:       1
 Epoch:         2
 License:       GPL v2+
 Group:         Networking/Admin
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.6/%{name}-%{version}.tar.xz
-# Source0-md5: ccdac1d03133a59065cbb93a09fa54b0
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.10/%{name}-%{version}.tar.xz
+# Source0-md5: 42d83efdff7f23381c0971981222b491
 Source1:       %{name}.conf
 Source3:       %{name}.tmpfiles
 Source4:       %{name}.init
@@ -25,6 +25,7 @@ BuildRequires:        audit-libs-devel
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.12
 BuildRequires: bluez-libs-devel >= 5.0
+BuildRequires: curl-devel >= 7.24.0
 BuildRequires: dbus-devel >= 1.1.0
 BuildRequires: dbus-glib-devel >= 0.100
 BuildRequires: gettext-tools >= 0.17
@@ -37,8 +38,8 @@ BuildRequires:        intltool >= 0.40.0
 BuildRequires: jansson-devel
 BuildRequires: libndp-devel
 BuildRequires: libnl-devel >= 3.2.8
+BuildRequires: libpsl-devel >= 0.1
 BuildRequires: libselinux-devel
-BuildRequires: libsoup-devel >= 2.40.0
 BuildRequires: libteamdctl-devel >= 1.9
 BuildRequires: libtool >= 2:2.2
 BuildRequires: libuuid-devel
@@ -49,13 +50,13 @@ BuildRequires:      perl-base
 BuildRequires: pkgconfig
 BuildRequires: polkit-devel >= 0.97
 BuildRequires: ppp-plugin-devel >= 3:2.4.6
+BuildRequires: python-pygobject3
 BuildRequires: readline-devel
 BuildRequires: rpmbuild(macros) >= 1.673
 BuildRequires: sed >= 4.0
 %{?with_systemd:BuildRequires: systemd-devel >= 1:209}
 BuildRequires: tar >= 1:1.22
-BuildRequires: udev-devel
-BuildRequires: udev-glib-devel >= 1:165
+BuildRequires: udev-devel >= 1:175
 %{?with_vala:BuildRequires:    vala >= 2:0.17.1.24}
 BuildRequires: xz
 Requires(post,preun):  /sbin/chkconfig
@@ -66,10 +67,11 @@ Suggests:   ConsoleKit-x11
 %else
 Requires:      ConsoleKit-x11
 %endif
+Requires:      curl-libs >= 7.24.0
 Requires:      dhcp-client
 Requires:      filesystem >= 3.0-37
 Requires:      libnl >= 3.2.8
-Requires:      libsoup >= 2.40.0
+Requires:      libpsl >= 0.1
 Requires:      libteamdctl >= 1.9
 Requires:      newt >= 0.52.15
 Requires:      polkit >= 0.97
@@ -116,7 +118,7 @@ Group:              Libraries
 Requires:      dbus-glib >= 0.100
 Requires:      glib2 >= 1:2.38.0
 Requires:      nss >= 3.11
-Requires:      udev-glib >= 1:165
+Requires:      udev-libs >= 1:175
 Conflicts:     NetworkManager < 0.6.4-0.2
 
 %description libs
@@ -134,7 +136,6 @@ Requires:   dbus-glib-devel >= 0.100
 Requires:      glib2-devel >= 1:2.38.0
 Requires:      libuuid-devel
 Requires:      nss-devel >= 3.11
-Requires:      udev-glib-devel >= 1:165
 
 %description devel
 Network Manager includes and more.
@@ -201,13 +202,15 @@ Bashowe uzupełnianie nazw dla polecenia NetworkManagera (nmcli).
 %{__autoheader}
 %{__automake}
 %configure \
-       --disable-silent-rules \
-       --with-html-dir=%{_gtkdocdir} \
        --enable-gtk-doc \
        --enable-ifcfg-rh \
        --enable-more-warnings \
+       --disable-silent-rules \
+       --enable-static \
+       %{!?with_vala:--disable-vala} \
        --with-dhclient=/sbin/dhclient \
        --with-dhcpcd=/sbin/dhcpcd \
+       --with-html-dir=%{_gtkdocdir} \
        --with-iptables=/usr/sbin/iptables \
        --with-nmcli \
        --with-system-ca-path=/etc/certs \
@@ -219,16 +222,15 @@ Bashowe uzupełnianie nazw dla polecenia NetworkManagera (nmcli).
        --with-pppoe=/usr/sbin/pppoe \
        --with-resolvconf=/sbin/resolvconf \
        --with-udev-dir=/lib/udev \
-       --with-dist-version=%{version}-%{release} \
-       --enable-static \
-       %{!?with_vala:--disable-vala}
+       --with-dist-version=%{version}-%{release}
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/var/run/%{name},%{systemdtmpfilesdir}} \
-       $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{VPN,dispatcher.d,system-connections} \
+       $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{VPN,conf.d,dispatcher.d,dnsmasq.d,dnsmasq-shared.d,system-connections} \
+       $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/dispatcher.d/{pre-down.d,pre-up.d,no-wait.d} \
        $RPM_BUILD_ROOT%{_prefix}/lib/%{name}/{VPN,conf.d}
 
 %{__make} install \
@@ -300,6 +302,7 @@ exit 0
 %dir %{_libdir}/NetworkManager
 %attr(755,root,root) %{_libdir}/NetworkManager/libnm-device-plugin-adsl.so
 %attr(755,root,root) %{_libdir}/NetworkManager/libnm-device-plugin-bluetooth.so
+%attr(755,root,root) %{_libdir}/NetworkManager/libnm-device-plugin-ovs.so
 %attr(755,root,root) %{_libdir}/NetworkManager/libnm-device-plugin-wifi.so
 %attr(755,root,root) %{_libdir}/NetworkManager/libnm-device-plugin-wwan.so
 %attr(755,root,root) %{_libdir}/NetworkManager/libnm-device-plugin-team.so
@@ -320,9 +323,8 @@ exit 0
 %{systemdunitdir}/NetworkManager.service
 %{systemdunitdir}/NetworkManager-dispatcher.service
 %{systemdunitdir}/NetworkManager-wait-online.service
-# XXX: dir here or add to systemd-units?
-%dir %{systemdunitdir}/network-online.target.wants
-%{systemdunitdir}/network-online.target.wants/NetworkManager-wait-online.service
+%dir %{systemdunitdir}/NetworkManager.service.d
+%{systemdunitdir}/NetworkManager.service.d/NetworkManager-ovs.conf
 %{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManager.service
 %{systemdtmpfilesdir}/%{name}.conf
 %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
@@ -330,6 +332,13 @@ exit 0
 /lib/udev/rules.d/84-nm-drivers.rules
 /lib/udev/rules.d/85-nm-unmanaged.rules
 %dir %{_sysconfdir}/%{name}/VPN
+%dir %{_sysconfdir}/%{name}/conf.d
+%dir %{_sysconfdir}/%{name}/dispatcher.d
+%dir %{_sysconfdir}/%{name}/dispatcher.d/pre-down.d
+%dir %{_sysconfdir}/%{name}/dispatcher.d/pre-up.d
+%dir %{_sysconfdir}/%{name}/dispatcher.d/no-wait.d
+%dir %{_sysconfdir}/%{name}/dnsmasq.d
+%dir %{_sysconfdir}/%{name}/dnsmasq-shared.d
 %dir %{_sysconfdir}/%{name}/system-connections
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/%{name}.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-dispatcher.conf
@@ -348,6 +357,7 @@ exit 0
 %{_mandir}/man5/nm-settings-keyfile.5*
 %{_mandir}/man5/nm-settings.5*
 %{_mandir}/man5/nm-system-settings.conf.5*
+%{_mandir}/man7/nm-openvswitch.7*
 %{_mandir}/man7/nmcli-examples.7*
 %{_mandir}/man8/NetworkManager.8*
 %{_examplesdir}/%{name}-%{version}