Update to git snapshot
This commit is contained in:
parent
53e545647e
commit
8ab74ba0ab
1
.gitignore
vendored
1
.gitignore
vendored
@ -285,3 +285,4 @@ network-manager-applet-0.8.1.tar.bz2
|
|||||||
/NetworkManager-0.9.5.95.git20120713.tar.bz2
|
/NetworkManager-0.9.5.95.git20120713.tar.bz2
|
||||||
/NetworkManager-0.9.5.96.tar.bz2
|
/NetworkManager-0.9.5.96.tar.bz2
|
||||||
/NetworkManager-0.9.7.0.git20120820.tar.bz2
|
/NetworkManager-0.9.7.0.git20120820.tar.bz2
|
||||||
|
/NetworkManager-0.9.7.0.git20121004.tar.bz2
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
%define libnl3_version 3.2.6
|
%define libnl3_version 3.2.6
|
||||||
%define ppp_version 2.4.5
|
%define ppp_version 2.4.5
|
||||||
|
|
||||||
%define snapshot .git20120820
|
%define snapshot .git20121004
|
||||||
%define realversion 0.9.7.0
|
%define realversion 0.9.7.0
|
||||||
|
|
||||||
%if 0%{?fedora} && 0%{?fedora} < 17
|
%if 0%{?fedora} && 0%{?fedora} < 17
|
||||||
@ -19,7 +19,7 @@ Name: NetworkManager
|
|||||||
Summary: Network connection manager and user applications
|
Summary: Network connection manager and user applications
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 0.9.7.0
|
Version: 0.9.7.0
|
||||||
Release: 1%{snapshot}%{?dist}
|
Release: 2%{snapshot}%{?dist}
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://www.gnome.org/projects/NetworkManager/
|
URL: http://www.gnome.org/projects/NetworkManager/
|
||||||
@ -27,8 +27,7 @@ URL: http://www.gnome.org/projects/NetworkManager/
|
|||||||
Source: %{name}-%{realversion}%{snapshot}.tar.bz2
|
Source: %{name}-%{realversion}%{snapshot}.tar.bz2
|
||||||
Source1: NetworkManager.conf
|
Source1: NetworkManager.conf
|
||||||
Patch1: explain-dns1-dns2.patch
|
Patch1: explain-dns1-dns2.patch
|
||||||
Patch2: nm-polkit-permissive.patch
|
Patch2: nss-error.patch
|
||||||
Patch3: nss-error.patch
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
Requires(post): chkconfig
|
Requires(post): chkconfig
|
||||||
@ -151,8 +150,7 @@ NetworkManager functionality from applications that use glib.
|
|||||||
%setup -q -n NetworkManager-%{realversion}
|
%setup -q -n NetworkManager-%{realversion}
|
||||||
|
|
||||||
%patch1 -p1 -b .explain-dns1-dns2
|
%patch1 -p1 -b .explain-dns1-dns2
|
||||||
%patch2 -p1 -b .polkit-permissive
|
%patch2 -p1 -b .nss-error
|
||||||
%patch3 -p1 -b .nss-error
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
@ -173,6 +171,7 @@ intltoolize --force
|
|||||||
--enable-wimax=yes \
|
--enable-wimax=yes \
|
||||||
%endif
|
%endif
|
||||||
--enable-polkit=yes \
|
--enable-polkit=yes \
|
||||||
|
--enable-modify-system=yes \
|
||||||
--with-session-tracking=systemd \
|
--with-session-tracking=systemd \
|
||||||
--with-docs=yes \
|
--with-docs=yes \
|
||||||
--with-system-ca-path=/etc/pki/tls/certs \
|
--with-system-ca-path=/etc/pki/tls/certs \
|
||||||
@ -342,6 +341,9 @@ exit 0
|
|||||||
%{_datadir}/gtk-doc/html/libnm-util/*
|
%{_datadir}/gtk-doc/html/libnm-util/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Oct 4 2012 Dan Winship <danw@redhat.com> - 0.9.7.0-2.git20121004
|
||||||
|
- Update to git snapshot
|
||||||
|
|
||||||
* Tue Aug 21 2012 Dan Winship <danw@redhat.com> - 0.9.7.0-1.git20120820
|
* Tue Aug 21 2012 Dan Winship <danw@redhat.com> - 0.9.7.0-1.git20120820
|
||||||
- Update to 0.9.7.0 snapshot
|
- Update to 0.9.7.0 snapshot
|
||||||
|
|
||||||
|
@ -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</_message>
|
|
||||||
<defaults>
|
|
||||||
<allow_inactive>no</allow_inactive>
|
|
||||||
- <allow_active>auth_admin_keep</allow_active>
|
|
||||||
+ <allow_active>yes</allow_active>
|
|
||||||
</defaults>
|
|
||||||
</action>
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user