|
|
|
@ -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.
|
|
|
|
|