From 8c91a3ec1fb6f83174528775238d26d0e16214ae Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Fri, 3 Jun 2016 21:07:37 +0200 Subject: [PATCH] Update to 2.0.1. - Remove patch no longer needed. --- .gitignore | 18 +---------- lxc-1.1.4-fix-bootorder.patch | 11 ------- ...fix-init.patch => lxc-2.0.1-fix-init.patch | 32 +++++++++---------- lxc.spec | 11 ++++--- sources | 2 +- 5 files changed, 24 insertions(+), 50 deletions(-) delete mode 100644 lxc-1.1.4-fix-bootorder.patch rename lxc-1.1.0-fix-init.patch => lxc-2.0.1-fix-init.patch (50%) diff --git a/.gitignore b/.gitignore index b571f18..0f53774 100644 --- a/.gitignore +++ b/.gitignore @@ -1,17 +1 @@ -lxc-0.7.2.tar.gz -/lxc-0.7.4.1.tar.gz -/lxc-0.7.4.2.tar.gz -/lxc-0.7.5.tar.gz -/lxc-0.8.0.tar.gz -/lxc-0.9.0.tar.gz -/lxc-1.0.3.tar.gz -/lxc-1.0.4.tar.gz -/lxc-1.0.5.tar.gz -/lxc-e75a5c5c76c649435bd9171d5ea457fe727f5388.tar.gz -/lxc-1.1.0.tar.gz -/lxc-1.1.1.tar.gz -/lxc-1.1.2.tar.gz -/lxc-1.1.3.tar.gz -/lxc-1.1.4.tar.gz -/lxc-1.1.5.tar.gz -/lxc-2.0.0.tar.gz +/lxc-*.tar.gz diff --git a/lxc-1.1.4-fix-bootorder.patch b/lxc-1.1.4-fix-bootorder.patch deleted file mode 100644 index cd064b4..0000000 --- a/lxc-1.1.4-fix-bootorder.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up lxc-1.1.4/config/init/systemd/lxc.service.in.orig lxc-1.1.4/config/init/systemd/lxc.service.in ---- lxc-1.1.4/config/init/systemd/lxc.service.in.orig 2015-10-06 16:18:16.000000000 +0200 -+++ lxc-1.1.4/config/init/systemd/lxc.service.in 2015-10-21 16:33:41.193477243 +0200 -@@ -1,6 +1,6 @@ - [Unit] - Description=LXC Container Initialization and Autoboot Code --After=syslog.target network.target lxc-net.service -+After=syslog.target network-online.target lxc-net.service - Wants=lxc-net.service - - [Service] diff --git a/lxc-1.1.0-fix-init.patch b/lxc-2.0.1-fix-init.patch similarity index 50% rename from lxc-1.1.0-fix-init.patch rename to lxc-2.0.1-fix-init.patch index 1739c48..343c22c 100644 --- a/lxc-1.1.0-fix-init.patch +++ b/lxc-2.0.1-fix-init.patch @@ -1,8 +1,7 @@ -diff --git a/config/init/sysvinit/lxc-containers.in b/config/init/sysvinit/lxc-containers.in -index bc93322..06ca8f4 100644 ---- a/config/init/sysvinit/lxc-containers.in -+++ b/config/init/sysvinit/lxc-containers.in -@@ -2,13 +2,15 @@ +diff -up lxc-2.0.1/config/init/sysvinit/lxc-containers.in.orig lxc-2.0.1/config/init/sysvinit/lxc-containers.in +--- lxc-2.0.1/config/init/sysvinit/lxc-containers.in.orig 2016-05-18 20:40:05.308604928 +0200 ++++ lxc-2.0.1/config/init/sysvinit/lxc-containers.in 2016-05-18 20:42:15.855301108 +0200 +@@ -2,7 +2,7 @@ # # lxc Start/Stop LXC autoboot containers # @@ -11,21 +10,21 @@ index bc93322..06ca8f4 100644 # description: Starts/Stops all LXC containers configured for autostart. # ### BEGIN INIT INFO - # Provides: lxc +@@ -11,8 +11,8 @@ + # Required-Stop: $syslog $remote_fs + # Should-Start: + # Should-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -+# Required-Start: $local_fs $network -+# Required-Stop: $local_fs $network +# Default-Start: +# Default-Stop: # Short-Description: Bring up/down LXC autostart containers # Description: Bring up/down LXC autostart containers ### END INIT INFO -diff --git a/config/init/sysvinit/lxc-net.in b/config/init/sysvinit/lxc-net.in -index f6892c1..362469c 100644 ---- a/config/init/sysvinit/lxc-net.in -+++ b/config/init/sysvinit/lxc-net.in -@@ -2,13 +2,15 @@ +diff -up lxc-2.0.1/config/init/sysvinit/lxc-net.in.orig lxc-2.0.1/config/init/sysvinit/lxc-net.in +--- lxc-2.0.1/config/init/sysvinit/lxc-net.in.orig 2016-05-18 20:40:05.308604928 +0200 ++++ lxc-2.0.1/config/init/sysvinit/lxc-net.in 2016-05-18 20:42:29.560164233 +0200 +@@ -2,7 +2,7 @@ # # lxc-net Start/Stop LXC Networking # @@ -34,11 +33,12 @@ index f6892c1..362469c 100644 # description: Starts/Stops LXC Network Bridge # ### BEGIN INIT INFO - # Provides: lxc-net +@@ -11,8 +11,8 @@ + # Required-Stop: $syslog $remote_fs + # Should-Start: + # Should-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 1 -+# Required-Start: $local_fs $network -+# Required-Stop: $local_fs $network +# Default-Start: +# Default-Stop: # Short-Description: Bring up/down LXC Network Bridge diff --git a/lxc.spec b/lxc.spec index 3260b3f..3490a0e 100644 --- a/lxc.spec +++ b/lxc.spec @@ -34,7 +34,7 @@ %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: lxc -Version: 2.0.0 +Version: 2.0.1 Release: %{?prerel:0.}1%{?prerel:.%{prerel}}%{?dist} Summary: Linux Resource Containers Group: Applications/System @@ -45,8 +45,7 @@ Source0: https://github.com/lxc/lxc/archive/%{commit}/%{name}-%{commit}.t %else Source0: http://linuxcontainers.org/downloads/%{name}-%{version}.tar.gz %endif -Patch0: lxc-1.1.0-fix-init.patch -Patch1: lxc-1.1.4-fix-bootorder.patch +Patch0: lxc-2.0.1-fix-init.patch Patch2: lxc-2.0.0-remove-werror.patch BuildRequires: docbook-utils BuildRequires: docbook2X @@ -180,8 +179,6 @@ This package contains documentation for %{name}. %prep %setup -q -n %{name}-%{?!prerel:%{version}}%{?prerel:%{commit}} %patch0 -p1 -# see rhbz#1263612 -%patch1 -p1 # -Wall with -Werror doesn't work well %patch2 -p1 @@ -382,6 +379,10 @@ fi %changelog +* Fri Jun 3 2016 Thomas Moschny - 2.0.1-1 +- Update to 2.0.1. +- Remove patch no longer needed. + * Wed Apr 20 2016 Thomas Moschny - 2.0.0-1 - Update to 2.0.0. - Obsolete the -extra subpackage. diff --git a/sources b/sources index 532d2d0..7ded415 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -04a7245a614cd3296b0ae9ceeeb83fbb lxc-2.0.0.tar.gz +2b89f83185a82286518098ad5f42ac02 lxc-2.0.1.tar.gz