[packages/lxc] - Updated to 1.1.5 - Seems docbook2X >= 0.8 is enough for docs build - S: dnsmasq - not always neee

matkor matkor at pld-linux.org
Tue Nov 24 10:29:31 CET 2015


commit e1610aa330439c4f242d33d728bb59a56bb724bf
Author: Mateusz Korniak <matkor at pld-linux.org>
Date:   Tue Nov 24 10:27:33 2015 +0100

    - Updated to 1.1.5
    - Seems docbook2X >= 0.8 is enough for docs build
    - S: dnsmasq  - not always neeeded and may working setups.
    - Release 0.1. Testing.

 lxc.spec | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/lxc.spec b/lxc.spec
index 4825f4c..725b24c 100644
--- a/lxc.spec
+++ b/lxc.spec
@@ -12,12 +12,12 @@
 Summary:	Linux Containers userspace tools
 Summary(pl.UTF-8):	Narzędzia do kontenerów linuksowych (LXC)
 Name:		lxc
-Version:	1.1.3
-Release:	2
+Version:	1.1.5
+Release:	0.1
 License:	LGPL v2.1+
 Group:		Applications/System
 Source0:	https://linuxcontainers.org/downloads/lxc/%{name}-%{version}.tar.gz
-# Source0-md5:	197abb5a28ab0b689c737eb1951023fb
+# Source0-md5:	dd9684dde0a58ed13f4f49c855b79a1a
 Source1:	%{name}-pld.in.sh
 # lxc-net based on bridge, macvlan is an alternative/supported lxc network
 Source2:	%{name}_macvlan.sysconfig
@@ -26,13 +26,13 @@ Patch0:		%{name}-pld.patch
 Patch1:		x32.patch
 Patch2:		%{name}-net.patch
 URL:		https://www.linuxcontainers.org/
+# BuildRequires:	docbook-dtd30-sgml
+# BuildRequires:	docbook-utils
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 %{?with_cgmanager:BuildRequires:	cgmanager-devel}
 %{?with_cgmanager:BuildRequires:	dbus-devel >= 1.2.16}
-BuildRequires:	docbook-dtd30-sgml
-BuildRequires:	docbook-utils
-BuildRequires:	docbook2X
+BuildRequires:	docbook2X >= 0.8
 BuildRequires:	gnutls-devel
 %{?with_apparmor:BuildRequires:	libapparmor-devel}
 BuildRequires:	libcap-devel
@@ -48,8 +48,6 @@ BuildRequires:	rpmbuild(macros) >= 1.671
 BuildRequires:	sed >= 4.0
 Requires(post):	/sbin/ldconfig
 Requires(post,preun):	/sbin/chkconfig
-# used in lxc-net script
-Requires:	dnsmasq
 # lxc_macvlan script
 Requires:	gawk
 # used in lxc-net script to set bridge nat
@@ -58,6 +56,8 @@ Requires:	iptables
 Requires:	rc-scripts >= 0.4.6
 Requires:	systemd-units >= 38
 Requires:	which
+# used in lxc-net script, but not all cases, may break working setups 
+Suggests:	dnsmasq
 Suggests:	gnupg
 Suggests:	gnupg-plugin-keys_curl
 Suggests:	gnupg-plugin-keys_hkp
@@ -288,6 +288,7 @@ fi
 %{_datadir}/%{name}/config/debian.*.conf
 %{_datadir}/%{name}/config/fedora.*.conf
 %{_datadir}/%{name}/config/gentoo.*.conf
+%{_datadir}/%{name}/config/nesting.conf
 %{_datadir}/%{name}/config/opensuse.*.conf
 %{_datadir}/%{name}/config/openwrt.*.conf
 %{_datadir}/%{name}/config/oracle.*.conf
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lxc.git/commitdiff/e1610aa330439c4f242d33d728bb59a56bb724bf



More information about the pld-cvs-commit mailing list