Attachment 605218 Details for Bug 831680 – A patch to upgrade to 0.9.6.0 with plugins=keyfile,ifcfg-rh

[patch] A patch to upgrade to 0.9.6.0 with plugins=keyfile,ifcfg-rh

nm-0.9.6.0.patch (text/plain), 2.10 KB, created by Pavel Šimerda (pavlix) on 2012-08-17 15:58:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Šimerda (pavlix)

Created: 2012-08-17 15:58:33 UTC

Size: 2.10 KB

patch

obsolete

>commit 56aab738a6e4a3653df075c876ea8c0e544239ea
>Author: Pavel Å imerda <pavlix@pavlix.net>
>Date:   Thu Aug 16 13:17:49 2012 +0200
>
>    Update to 0.9.6.0
>
>diff --git a/.gitignore b/.gitignore
>index 4dd0fe0..2139290 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -284,3 +284,4 @@ network-manager-applet-0.8.1.tar.bz2
> /NetworkManager-0.9.4.0.git20120521.tar.bz2
> /NetworkManager-0.9.5.95.git20120713.tar.bz2
> /NetworkManager-0.9.5.96.tar.bz2
>+/NetworkManager-0.9.6.0.tar.xz
>diff --git a/NetworkManager.conf b/NetworkManager.conf
>index 65e34a4..1b986e5 100644
>--- a/NetworkManager.conf
>+++ b/NetworkManager.conf
>@@ -1,2 +1,2 @@
> [main]
>-plugins=ifcfg-rh
>+plugins=keyfile,ifcfg-rh
>diff --git a/NetworkManager.spec b/NetworkManager.spec
>index 9e22213..dfd347b 100644
>--- a/NetworkManager.spec
>+++ b/NetworkManager.spec
>@@ -7,7 +7,7 @@
> %define ppp_version 2.4.5
> 
> %define snapshot %{nil}
>-%define realversion 0.9.5.96
>+%define realversion 0.9.6.0
> 
> %if 0%{?fedora} && 0%{?fedora} < 17
> %define systemd_dir /lib/systemd/system
>@@ -18,13 +18,13 @@
> Name: NetworkManager
> Summary: Network connection manager and user applications
> Epoch: 1
>-Version: 0.9.5.96
>-Release: 2%{snapshot}%{?dist}
>+Version: %{realversion}
>+Release: 1%{snapshot}%{?dist}
> Group: System Environment/Base
> License: GPLv2+
> URL: http://www.gnome.org/projects/NetworkManager/
> 
>-Source: %{name}-%{realversion}%{snapshot}.tar.bz2
>+Source: %{name}-%{realversion}%{snapshot}.tar.xz
> Source1: NetworkManager.conf
> Patch1: explain-dns1-dns2.patch
> Patch2: nm-polkit-permissive.patch
>@@ -343,6 +343,10 @@ exit 0
> %{_datadir}/gtk-doc/html/libnm-util/*
> 
> %changelog
>+* Thu Aug 16 2012 Pavel Å imerda <psimerda@redhat.com> - 1:0.9.6.0-1
>+- Update to 0.9.6.0
>+- Prefer keyfile over ifcfg-rh
>+
> * Fri Jul 27 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.9.5.96-2
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
> 
>diff --git a/sources b/sources
>index 8b68c85..0fddd74 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1,2 @@
> aa6d9b737db55281dfac13a930b7ed36  NetworkManager-0.9.5.96.tar.bz2
>+85f9ed7fe08533a33c5117488f81e7ac  NetworkManager-0.9.6.0.tar.xz

Actions: View | Diff

Attachments on bug 831680: 605218