[netcf/f18] update to 0.2.2-1

[Laine Stump]

commit 356eef7d0f3ececd3f3ef5ae4150ed9b45eb0c7c
Author: Laine Stump <laine at redhat.com>
Date:   Sat Aug 25 04:20:59 2012 -0400

    update to 0.2.2-1

 .gitignore |    1 +
 netcf.spec |   29 +++++++++++++++++++++++++++--
 sources    |    2 +-
 3 files changed, 29 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1a6e61a..5673a80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ netcf-0.1.6.tar.gz
 /netcf-0.1.8.tar.gz
 /netcf-0.1.9.tar.gz
 /netcf-0.2.1.tar.gz
+/netcf-0.2.2.tar.gz
diff --git a/netcf.spec b/netcf.spec
index bd8900d..199e486 100644
--- a/netcf.spec
+++ b/netcf.spec
@@ -1,5 +1,5 @@
 Name:           netcf
-Version:        0.2.1
+Version:        0.2.2
 Release:        1%{?dist}%{?extra_release}
 Summary:        Cross-platform network configuration library
 
@@ -11,7 +11,21 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  readline-devel augeas-devel >= 0.5.2
 BuildRequires:  libxml2-devel libxslt-devel
+
+# force the --with-libnl1 option on F17/RHEL6 and earlier
+%if (0%{?fedora} && 0%{?fedora} < 18) || (0%{?rhel} && 0%{?rhel} < 7)
+%define with_libnl1 1
+%else
+%define with_libnl1 0
+%endif
+
+# require libnl3 on F18/RHEL7 and later
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
+BuildRequires:  libnl3-devel
+%else
 BuildRequires:  libnl-devel
+%endif
+
 Requires:       %{name}-libs = %{version}-%{release}
 
 Provides: bundled(gnulib)
@@ -43,7 +57,12 @@ The libraries for %{name}.
 %setup -q
 
 %build
-%configure --disable-static
+%if %{with_libnl1}
+%define _with_libnl1 --with-libnl1
+%endif
+
+%configure --disable-static \
+           %{?_with_libnl1}
 make %{?_smp_mflags}
 
 %install
@@ -78,6 +97,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/netcf.pc
 
 %changelog
+* Sat Aug 25 2012 Laine Stump <laine at redhat.com> - 0.2.2-1
+- Rebase to netcf-0.2.2
+- specfile: require libnl3-devel for rpm builds on Fedora 18+ and
+  RHEL7+. Likewise, force libnl1 for F17- and RHEL6.x-, even if
+  libnl3-devel is installed.
+
 * Fri Aug 10 2012 Laine Stump <laine at redhat.com> - 0.2.1-1
 - Rebase to netcf-0.2.1
 - update gnulib to fix broken build on systems with nwer glibc (which no
diff --git a/sources b/sources
index 0957fca..35e970b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-04a293c0114107a828b770580d342895  netcf-0.2.1.tar.gz
+fbcd47101797b8fcd9519e22002cd200  netcf-0.2.2.tar.gz