From 21cf0282bb5904e51634f81b1bb28ec84de94d9f Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Sep 30 2014 15:06:49 +0000
Subject: import xz-5.1.2-9alpha.el7


---

diff --git a/SOURCES/xz-5.1.2alpha-less-version-check.patch b/SOURCES/xz-5.1.2alpha-less-version-check.patch
new file mode 100644
index 0000000..2381ddb
--- /dev/null
+++ b/SOURCES/xz-5.1.2alpha-less-version-check.patch
@@ -0,0 +1,13 @@
+diff --git a/src/scripts/xzless.in b/src/scripts/xzless.in
+index a3da697..288dd87 100644
+--- a/src/scripts/xzless.in
++++ b/src/scripts/xzless.in
+@@ -46,7 +46,7 @@ if test "${LESSMETACHARS+set}" != set; then
+ 	LESSMETACHARS="$space$tab$nl'"';*?"()<>[|&^`#\$%=~'
+ fi
+ 
+-if test "$(less -V | { read ver && echo ${ver#less }; })" -ge 429; then
++if test "$(less -V | { read less ver re && echo ${ver}; })" -ge 429; then
+ 	# less 429 or later: LESSOPEN pipe will be used on
+ 	# standard input if $LESSOPEN begins with |-.
+ 	LESSOPEN="|-$xz -cdfq -- %s"
diff --git a/SPECS/xz.spec b/SPECS/xz.spec
index 0373c08..f4cb1b7 100644
--- a/SPECS/xz.spec
+++ b/SPECS/xz.spec
@@ -3,7 +3,7 @@
 Summary:	LZMA compression utilities
 Name:		xz
 Version:	5.1.2
-Release:	8alpha%{?dist}
+Release:	9alpha%{?dist}
 License:	LGPLv2+
 Group:		Applications/File
 # official upstream release
@@ -24,6 +24,11 @@ Patch0:		xz-5.1.2alpha-man-page-day.patch
 # ~> #850898
 Patch1:		xz-5.1.2alpha-xzgrep-and-h-option.patch
 
+# fix less version checking
+# ~> upstream (db5c1817fa, 9e6dabcf22)
+# ~> #1082639, #1015924
+Patch2:		xz-5.1.2alpha-less-version-check.patch
+
 %description
 XZ Utils are an attempt to make LZMA compression easy to use on free (as in
 freedom) operating systems. This is achieved by providing tools and libraries
@@ -78,6 +83,7 @@ commands that deal with the older LZMA format.
 %setup -q -a1 -n %{name}-%{version}alpha
 %patch0  -p1 -b .man-page-day
 %patch1  -p1 -b .xzgrep-and-h-option
+%patch2  -p1 -b .less-version-check
 
 for i in `find . -name config.sub`; do
   perl -pi -e "s/ppc64-\*/ppc64-\* \| ppc64p7-\*/" $i
@@ -155,6 +161,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*lz*
 
 %changelog
+* Tue Jun 17 2014 Pavel Raiskup <praiskup@redhat.com> - 5.1.2-9alpha
+- better check the version of less binary (#1082639)
+
 * Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 5.1.2-8alpha
 - Mass rebuild 2014-01-24