diff --git a/NetworkManager.spec b/NetworkManager.spec index 8ebe51f..ab93dba 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -1,5 +1,3 @@ -%define udev_scriptdir /lib/udev - %define dbus_version 1.1 %define dbus_glib_version 0.86-4 @@ -9,15 +7,15 @@ %define libnl_version 1.1 %define ppp_version 2.4.5 -%define snapshot .git20100813 -%define applet_snapshot .git20100813 +%define snapshot .git20100817 +%define applet_snapshot .git20100817 %define realversion 0.8.1 Name: NetworkManager Summary: Network connection manager and user applications Epoch: 1 Version: 0.8.1 -Release: 3%{snapshot}%{?dist} +Release: 4%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -82,6 +80,9 @@ BuildRequires: desktop-file-utils %ifnarch s390 s390x BuildRequires: gnome-bluetooth-libs-devel >= 2.27.7.1-1 %endif +%if 0%{?fedora} >= 14 +BuildRequires: systemd +%endif %description NetworkManager is a system network service that manages your network devices @@ -324,7 +325,12 @@ fi %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service %{_libdir}/pppd/%{ppp_version}/nm-pppd-plugin.so %{_datadir}/polkit-1/actions/*.policy -%{udev_scriptdir}/rules.d/*.rules +/lib/udev/rules.d/*.rules +# systemd stuff +%if 0%{?fedora} >= 14 +/lib/systemd/system/NetworkManager.service +%{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManager.service +%endif %files devel %defattr(-,root,root,0755) @@ -376,6 +382,10 @@ fi %{_datadir}/gtk-doc/html/libnm-util/* %changelog +* Tue Aug 17 2010 Dan Williams - 0.8.1-4 +- core: rebuild to fix polkit 0.97 build issue +- applet: updated translations + * Fri Aug 13 2010 Dan Williams - 0.8.1-3 - core: rebuild to fix dbus-glib security issue (CVE-2010-1172) (rh #585394) diff --git a/sources b/sources index 2cfe599..d34edbd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -f83aed4b046ba37ad78dcb5c51c362e6 NetworkManager-0.8.1.git20100813.tar.bz2 -f491cd2d82524c60f9c0b18609026485 network-manager-applet-0.8.1.git20100813.tar.bz2 +436fdced81eadb278c3ad194d2b02c99 NetworkManager-0.8.1.git20100817.tar.bz2 +5faff7a57d405d501063ad94bdae81e1 network-manager-applet-0.8.1.git20100817.tar.bz2