From b80706496044e79d78a61626ef92a282fa2fb876 Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm@fedoraproject.org>
Date: Wed, 5 Oct 2016 13:26:19 +0200
Subject: [PATCH] Update to 2.0.5.

---
 lxc-2.0.0-remove-werror.patch | 12 ------------
 lxc.spec                      | 18 +++++++++---------
 sources                       |  2 +-
 3 files changed, 10 insertions(+), 22 deletions(-)
 delete mode 100644 lxc-2.0.0-remove-werror.patch

diff --git a/lxc-2.0.0-remove-werror.patch b/lxc-2.0.0-remove-werror.patch
deleted file mode 100644
index b2da700..0000000
--- a/lxc-2.0.0-remove-werror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up lxc-2.0.0/configure.ac.orig lxc-2.0.0/configure.ac
---- lxc-2.0.0/configure.ac.orig	2016-04-06 19:59:42.000000000 +0200
-+++ lxc-2.0.0/configure.ac	2016-04-21 07:46:29.936382133 +0200
-@@ -626,7 +626,7 @@ AC_PROG_SED
- LXC_CHECK_TLS
- 
- if test "x$GCC" = "xyes"; then
--	CFLAGS="$CFLAGS -Wall -Werror"
-+	CFLAGS="$CFLAGS -Wall"
- fi
- 
- # Files requiring some variable expansion
diff --git a/lxc.spec b/lxc.spec
index 7b04b3e..0f5cd80 100644
--- a/lxc.spec
+++ b/lxc.spec
@@ -30,7 +30,7 @@
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:           lxc
-Version:        2.0.4
+Version:        2.0.5
 Release:        %{?prerel:0.}1%{?prerel:.%{prerel}}%{?dist}
 Summary:        Linux Resource Containers
 Group:          Applications/System
@@ -42,7 +42,6 @@ Source0:        https://github.com/lxc/lxc/archive/%{commit}/%{name}-%{commit}.t
 Source0:        http://linuxcontainers.org/downloads/%{name}-%{version}.tar.gz
 %endif
 Patch0:         lxc-2.0.1-fix-init.patch
-Patch2:         lxc-2.0.0-remove-werror.patch
 BuildRequires:  docbook2X
 BuildRequires:  doxygen
 BuildRequires:  kernel-headers
@@ -63,10 +62,9 @@ BuildRequires:  systemd
 # C and does not depend on the Python3 binding anymore
 Provides:       lxc-extra = %{version}-%{release}
 Obsoletes:      lxc-extra < 1.1.5-3
-#if 0%{?prerel:1}
-# we patch configure.ac
+%if 0%{?prerel:1}
 BuildRequires:  autoconf automake
-#endif
+%endif
 
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
@@ -174,14 +172,12 @@ This package contains documentation for %{name}.
 %prep
 %setup -q -n %{name}-%{?!prerel:%{version}}%{?prerel:%{commit}}
 %patch0 -p1
-# -Wall with -Werror doesn't work well
-%patch2 -p1
 
 
 %build
-#if 0%{?prerel:1}
+%if 0%{?prerel:1}
 ./autogen.sh
-#endif
+%endif
 %configure --with-distro=fedora \
            --enable-doc \
            --enable-api-docs \
@@ -205,6 +201,7 @@ This package contains documentation for %{name}.
 %else
            --with-init-script=sysvinit \
 %endif # with_systemd
+           --disable-werror \
 # intentionally blank line
 %{make_build}
 
@@ -373,6 +370,9 @@ fi
 
 
 %changelog
+* Wed Oct  5 2016 Thomas Moschny <thomas.moschny@gmx.de> - 2.0.5-1
+- Update to 2.0.5.
+
 * Tue Aug 16 2016 Thomas Moschny <thomas.moschny@gmx.de> - 2.0.4-1
 - Update to 2.0.4.
 - Remove conditional for eol'ed Fedora releases.
diff --git a/sources b/sources
index eda481c..1789328 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-28db4dbacf860ae742138c0ed8dbf14c  lxc-2.0.4.tar.gz
+59792f085be451b8cf336d86ac335123  lxc-2.0.5.tar.gz