From 0473dc0805ff123c3cadb03ba625268c865b0952 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sun, 10 Aug 2014 13:00:47 +0200 Subject: [PATCH] Update to 1.1.0.alpha1. --- .gitignore | 1 + lxc.spec | 24 +++++++++++++++++++++--- sources | 2 +- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 7a2e347..3b8f0f3 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ lxc-0.7.2.tar.gz /lxc-1.0.3.tar.gz /lxc-1.0.4.tar.gz /lxc-1.0.5.tar.gz +/lxc-e75a5c5c76c649435bd9171d5ea457fe727f5388.tar.gz diff --git a/lxc.spec b/lxc.spec index 274add5..0c2a12f 100644 --- a/lxc.spec +++ b/lxc.spec @@ -18,14 +18,23 @@ %global lualibdir %{_libdir}/lua/%{luaver} %global luapkgdir %{_datadir}/lua/%{luaver} +# for pre-releases +%global prerel alpha1 +%global commit e75a5c5c76c649435bd9171d5ea457fe727f5388 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + Name: lxc -Version: 1.0.5 -Release: 2%{?dist} +Version: 1.1.0 +Release: %{?prerel:0.}1%{?prerel:.%{prerel}}%{?dist} Summary: Linux Resource Containers Group: Applications/System License: LGPLv2+ and GPLv2 URL: http://linuxcontainers.org +%if 0%{?prerel:1} +Source0: https://github.com/lxc/lxc/archive/%{commit}/%{name}-%{commit}.tar.gz +%else Source0: http://linuxcontainers.org/downloads/%{name}-%{version}.tar.gz +%endif Patch0: lxc-1.0.4-fix-init.patch BuildRequires: docbook-utils Buildrequires: docbook2X @@ -44,6 +53,9 @@ BuildRequires: python3-devel >= 3.2 %if 0%{?with_systemd} BuildRequires: systemd %endif # with_systemd +%if 0%{?prerel:1} +BuildRequires: autoconf automake +%endif # for lxc-top Requires: lua-%{name}%{?_isa} = %{version}-%{release} @@ -161,11 +173,14 @@ This package contains documentation for %{name}. %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{?!prerel:%{version}}%{?prerel:%{commit}} %patch0 -p1 %build +%if 0%{?prerel:1} +./autogen.sh +%endif %configure --with-distro=fedora \ --enable-doc \ --enable-api-docs \ @@ -344,6 +359,9 @@ fi %changelog +* Sun Aug 10 2014 Thomas Moschny - 1.1.0-0.1.alpha1 +- Update to 1.1.0.alpha1. + * Fri Aug 8 2014 Thomas Moschny - 1.0.5-2 - Include sysvinit resp. systemd support for autostart of containers. - Do not list explicit requirements for templates. diff --git a/sources b/sources index 6bc09a7..c4eed80 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9d9af9e9e69a831cd50b58d91c786013 lxc-1.0.5.tar.gz +8e62a6f6a452a868ad0d7d4e7870a234 lxc-e75a5c5c76c649435bd9171d5ea457fe727f5388.tar.gz