X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=NetworkManager.spec;h=6200b83fcb11d766486ab1e6087ab88ee21d8497;hb=ff5ed25f5dfe0f3141243db6c894f883efef495e;hp=a2cc48f7af109433fa0614ca60c6a6a67b44bbea;hpb=545501783f2c65c43797aa2b68c7a6bbedbbffbc;p=packages%2FNetworkManager.git diff --git a/NetworkManager.spec b/NetworkManager.spec index a2cc48f..6200b83 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -6,24 +6,26 @@ Summary: Network Manager for GNOME Summary(pl.UTF-8): Zarządca sieci dla GNOME Name: NetworkManager -Version: 1.4.2 -Release: 2 +Version: 1.10.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.10/%{name}-%{version}.tar.xz +# Source0-md5: 42d83efdff7f23381c0971981222b491 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 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 @@ -36,23 +38,25 @@ 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 +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: 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 @@ -63,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 @@ -113,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 @@ -131,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. @@ -186,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} @@ -197,14 +202,17 @@ 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=yes \ + --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=yes \ + --with-nmcli \ --with-system-ca-path=/etc/certs \ --with-systemdsystemunitdir=%{systemdunitdir} \ --with-session-tracking=%{?with_systemd:systemd}%{!?with_systemd:ck} \ @@ -214,17 +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} \ - --with-docs \ - --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 \ @@ -244,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 @@ -298,9 +302,11 @@ 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 +%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 @@ -317,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 @@ -327,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 @@ -345,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} @@ -384,6 +397,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 @@ -398,6 +413,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