[augeas] Fix /etc/sysconfig/network (RHBZ#904222).

[Richard W.M. Jones]

commit 0edf09533691ca67f8e4e57dd8fb92cbae611393
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Tue Jun 18 15:48:05 2013 +0100

    Fix /etc/sysconfig/network (RHBZ#904222).

 ...Shellvars-reinstate-etc-sysconfig-network.patch |   25 ++++++++++++++++++++
 augeas.spec                                        |   12 ++++++---
 2 files changed, 33 insertions(+), 4 deletions(-)
---
diff --git a/0001-Shellvars-reinstate-etc-sysconfig-network.patch b/0001-Shellvars-reinstate-etc-sysconfig-network.patch
new file mode 100644
index 0000000..c79710e
--- /dev/null
+++ b/0001-Shellvars-reinstate-etc-sysconfig-network.patch
@@ -0,0 +1,25 @@
+From d6959e6211dc25040c9dd6bf8d75605a3a6155a0 Mon Sep 17 00:00:00 2001
+From: Dominic Cleal <dcleal at redhat.com>
+Date: Thu, 21 Mar 2013 08:45:54 +0000
+Subject: [PATCH] Shellvars: reinstate /etc/sysconfig/network
+
+Fixes #330, RHBZ#904222, RHBZ#920609
+---
+ lenses/shellvars.aug | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/lenses/shellvars.aug b/lenses/shellvars.aug
+index 5739e18..0c67f96 100644
+--- a/lenses/shellvars.aug
++++ b/lenses/shellvars.aug
+@@ -176,7 +176,6 @@ module Shellvars =
+       sc_excl "sysstat.ioconf" .
+       sc_excl "system-config-firewall" .
+       sc_excl "system-config-securitylevel" .
+-      sc_excl "network" .
+       sc_incl "network/config" .
+       sc_incl "network/dhcp" .
+       sc_incl "network/dhcp6r" .
+-- 
+1.8.2.1
+
diff --git a/augeas.spec b/augeas.spec
index b5f152c..a4235c2 100644
--- a/augeas.spec
+++ b/augeas.spec
@@ -1,6 +1,6 @@
 Name:           augeas
 Version:        1.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A library for changing configuration files
 
 Group:          System Environment/Libraries
@@ -8,9 +8,9 @@ License:        LGPLv2+
 URL:            http://augeas.net/
 Source0:        http://augeas.net/download/%{name}-%{version}.tar.gz
 
-# Format of the patch name is augeas-VERSION-NUMBER-HASH where VERSION
-# gives the first version where this patch was applied, NUMBER orders patches
-# against the same version, and HASH is the git commit hash from upstream
+# Upstream commit: https://github.com/hercules-team/augeas/commit/d6959e62
+# RHBZ#904222
+Patch1:         0001-Shellvars-reinstate-etc-sysconfig-network.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -48,6 +48,7 @@ The libraries for %{name}.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %configure --disable-static
@@ -94,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/augeas.pc
 
 %changelog
+* Tue Jun 18 2013 Richard W.M. Jones <rjones at redhat.com> - 1.0.0-4
+- Fix /etc/sysconfig/network (RHBZ#904222).
+
 * Wed Jun  5 2013 Richard W.M. Jones <rjones at redhat.com> - 1.0.0-3
 - Don't package lenses in tests/ subdirectory.