Update to 1.6.2

[packages/NetworkManager.git] / NetworkManager.spec

diff --git a/NetworkManager.spec b/NetworkManager.spec
index fe96f7d0820ce6c16deeaff5cc635f2db378cf35..69817f07b7aa6c8a746f71077780295bd770661b 100644 (file)
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -6,18 +6,19 @@
 Summary:       Network Manager for GNOME
 Summary(pl.UTF-8):     Zarządca sieci dla GNOME
 Name:          NetworkManager
-Version:       1.4.2
+Version:       1.6.2
 Release:       1
 Epoch:         2
 License:       GPL v2+
 Group:         Networking/Admin
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.4/%{name}-%{version}.tar.xz
-# Source0-md5: 59b5b5585467756787c6cb535cbd306e
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.6/%{name}-%{version}.tar.xz
+# Source0-md5: 89c975afe19fbac854191edb6e9bcd3b
 Source1:       %{name}.conf
 Source3:       %{name}.tmpfiles
 Source4:       %{name}.init
 Patch0:                ifcfg-path.patch
-Patch1:                systemd-fallback.patch
+Patch1:                %{name}-sh.patch
+Patch2:                systemd-fallback.patch
 URL:           https://wiki.gnome.org/Projects/NetworkManager
 BuildRequires: ModemManager-devel >= 1.0.0
 BuildRequires: audit-libs-devel
@@ -26,7 +27,6 @@ BuildRequires:        automake >= 1:1.12
 BuildRequires: bluez-libs-devel >= 5.0
 BuildRequires: dbus-devel >= 1.1.0
 BuildRequires: dbus-glib-devel >= 0.100
-BuildRequires: docbook-dtd412-xml
 BuildRequires: gettext-tools >= 0.17
 BuildRequires: glib2-devel >= 1:2.38.0
 BuildRequires: gnome-common
@@ -42,13 +42,15 @@ BuildRequires:      libsoup-devel >= 2.40.0
 BuildRequires: libteamdctl-devel >= 1.9
 BuildRequires: libtool >= 2:2.2
 BuildRequires: libuuid-devel
+BuildRequires: libxslt-progs
 BuildRequires: newt-devel >= 0.52.15
 BuildRequires: nss-devel >= 3.11
+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: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.673
 BuildRequires: sed >= 4.0
 %{?with_systemd:BuildRequires: systemd-devel >= 1:209}
@@ -188,7 +190,8 @@ Bashowe uzupełnianie nazw dla polecenia NetworkManagera (nmcli).
 %prep
 %setup -q
 %patch0 -p1
-%{?with_systemd:%patch1 -p1}
+%patch1 -p1
+%{?with_systemd:%patch2 -p1}
 
 %build
 %{__gtkdocize}
@@ -201,12 +204,13 @@ Bashowe uzupełnianie nazw dla polecenia NetworkManagera (nmcli).
 %configure \
        --disable-silent-rules \
        --with-html-dir=%{_gtkdocdir} \
+       --enable-gtk-doc \
        --enable-ifcfg-rh \
-       --enable-more-warnings=yes \
+       --enable-more-warnings \
        --with-dhclient=/sbin/dhclient \
        --with-dhcpcd=/sbin/dhcpcd \
        --with-iptables=/usr/sbin/iptables \
-       --with-nmcli=yes \
+       --with-nmcli \
        --with-system-ca-path=/etc/certs \
        --with-systemdsystemunitdir=%{systemdunitdir} \
        --with-session-tracking=%{?with_systemd:systemd}%{!?with_systemd:ck} \
@@ -217,7 +221,6 @@ Bashowe uzupełnianie nazw dla polecenia NetworkManagera (nmcli).
        --with-resolvconf=/sbin/resolvconf \
        --with-udev-dir=/lib/udev \
        --with-dist-version=%{version}-%{release} \
-       --with-docs \
        --enable-static \
        %{!?with_vala:--disable-vala}
 
@@ -226,7 +229,8 @@ Bashowe uzupełnianie nazw dla polecenia NetworkManagera (nmcli).
 %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 \
@@ -246,12 +250,10 @@ cp -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 %find_lang %{name}
 
 # examples
+%{__make} clean-checkPROGRAMS
+
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-%{__make} clean \
-       top_builddir=$(pwd) \
-       -C $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-find $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} -name 'Makefile*' | xargs rm
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -303,6 +305,7 @@ exit 0
 %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
+%attr(755,root,root) %{_libdir}/NetworkManager/libnm-ppp-plugin.so
 %attr(755,root,root) %{_libdir}/NetworkManager/libnm-settings-plugin-ibft.so
 %attr(755,root,root) %{_libdir}/NetworkManager/libnm-settings-plugin-ifcfg-rh.so
 %attr(755,root,root) %{_libdir}/NetworkManager/libnm-wwan.so
@@ -329,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
@@ -386,6 +396,8 @@ exit 0
 %{_pkgconfigdir}/libnm-util.pc
 %{_pkgconfigdir}/libnm-glib-vpn.pc
 %{_pkgconfigdir}/libnm-glib.pc
+%{_datadir}/dbus-1/interfaces/org.freedesktop.NetworkManager.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.NetworkManager.*.xml
 %{_datadir}/gir-1.0/NM-1.0.gir
 %{_datadir}/gir-1.0/NMClient-1.0.gir
 %{_datadir}/gir-1.0/NetworkManager-1.0.gir
@@ -400,6 +412,8 @@ exit 0
 %if %{with vala}
 %files -n vala-NetworkManager
 %defattr(644,root,root,755)
+%{_datadir}/vala/vapi/libnm.deps
+%{_datadir}/vala/vapi/libnm.vapi
 %{_datadir}/vala/vapi/libnm-glib.deps
 %{_datadir}/vala/vapi/libnm-glib.vapi
 %{_datadir}/vala/vapi/libnm-util.deps