diff --git a/.gitignore b/.gitignore index 73276f7..8341a2b 100644 --- a/.gitignore +++ b/.gitignore @@ -285,3 +285,4 @@ network-manager-applet-0.8.1.tar.bz2 /NetworkManager-0.9.5.95.git20120713.tar.bz2 /NetworkManager-0.9.5.96.tar.bz2 /NetworkManager-0.9.7.0.git20120820.tar.bz2 +/NetworkManager-0.9.7.0.git20121004.tar.bz2 diff --git a/NetworkManager.spec b/NetworkManager.spec index ba7f644..5684d6b 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -6,7 +6,7 @@ %define libnl3_version 3.2.6 %define ppp_version 2.4.5 -%define snapshot .git20120820 +%define snapshot .git20121004 %define realversion 0.9.7.0 %if 0%{?fedora} && 0%{?fedora} < 17 @@ -19,7 +19,7 @@ Name: NetworkManager Summary: Network connection manager and user applications Epoch: 1 Version: 0.9.7.0 -Release: 1%{snapshot}%{?dist} +Release: 2%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -27,8 +27,7 @@ URL: http://www.gnome.org/projects/NetworkManager/ Source: %{name}-%{realversion}%{snapshot}.tar.bz2 Source1: NetworkManager.conf Patch1: explain-dns1-dns2.patch -Patch2: nm-polkit-permissive.patch -Patch3: nss-error.patch +Patch2: nss-error.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): chkconfig @@ -151,8 +150,7 @@ NetworkManager functionality from applications that use glib. %setup -q -n NetworkManager-%{realversion} %patch1 -p1 -b .explain-dns1-dns2 -%patch2 -p1 -b .polkit-permissive -%patch3 -p1 -b .nss-error +%patch2 -p1 -b .nss-error %build @@ -173,6 +171,7 @@ intltoolize --force --enable-wimax=yes \ %endif --enable-polkit=yes \ + --enable-modify-system=yes \ --with-session-tracking=systemd \ --with-docs=yes \ --with-system-ca-path=/etc/pki/tls/certs \ @@ -342,6 +341,9 @@ exit 0 %{_datadir}/gtk-doc/html/libnm-util/* %changelog +* Thu Oct 4 2012 Dan Winship - 0.9.7.0-2.git20121004 +- Update to git snapshot + * Tue Aug 21 2012 Dan Winship - 0.9.7.0-1.git20120820 - Update to 0.9.7.0 snapshot diff --git a/nm-polkit-permissive.patch b/nm-polkit-permissive.patch deleted file mode 100644 index 1ac4062..0000000 --- a/nm-polkit-permissive.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in.permissive NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in ---- NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in.permissive 2011-03-24 14:21:35.100912222 -0500 -+++ NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in 2011-03-24 14:21:49.916726997 -0500 -@@ -95,7 +95,7 @@ - <_message>System policy prevents modification of network settings for all users - - no -- auth_admin_keep -+ yes - - - diff --git a/sources b/sources index cdbeea4..a8ccd08 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dae208ae0ef20c36e084c0e7c384d094 NetworkManager-0.9.7.0.git20120820.tar.bz2 +1497b4089b97994d6c165799dbc08810 NetworkManager-0.9.7.0.git20121004.tar.bz2