[packages/moreutils] - up to 0.60

[arekm]

commit 78fedf338f787093388d7505211598e898801af4
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun Oct 29 10:23:17 2017 +0100

    - up to 0.60

 moreutils-make.patch | 11 -----------
 moreutils.spec       | 11 +++++------
 2 files changed, 5 insertions(+), 17 deletions(-)
---
diff --git a/moreutils.spec b/moreutils.spec
index bd079c7..a46fa88 100644
--- a/moreutils.spec
+++ b/moreutils.spec
@@ -1,13 +1,12 @@
 Summary:	A collection of unix tools
 Summary(pl.UTF-8):	Zestaw narzędzi uniksowych
 Name:		moreutils
-Version:	0.57
+Version:	0.60
 Release:	1
 License:	GPL v2+
 Group:		Applications/System
-Source0:	http://ftp.debian.org/debian/pool/main/m/moreutils/%{name}_%{version}.orig.tar.gz
-# Source0-md5:	2fd82a15dea059506a6f43ce717dbfad
-Patch0:		%{name}-make.patch
+Source0:	http://ftp.debian.org/debian/pool/main/m/moreutils/%{name}_%{version}.orig.tar.xz
+# Source0-md5:	cbbef359a67e75581c8d7b0f94decf15
 URL:		http://joeyh.name/code/moreutils/
 BuildRequires:	docbook-dtd44-xml
 BuildRequires:	docbook-style-xsl
@@ -62,12 +61,12 @@ narzędzia:
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__make} \
 	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags} -Wall"
+	CFLAGS="%{rpmcppflags} %{rpmcflags} -Wall" \
+	DOCBOOKXSL=%{_datadir}/sgml/docbook/xsl-stylesheets
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/moreutils-make.patch b/moreutils-make.patch
deleted file mode 100644
index 5d6a6b2..0000000
--- a/moreutils-make.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- moreutils/Makefile.orig	2013-11-06 03:35:50.000000000 +0100
-+++ moreutils/Makefile	2014-03-03 07:37:30.628133713 +0100
-@@ -5,7 +5,7 @@
- INSTALL_BIN?=install -s
- PREFIX?=/usr
- 
--DOCBOOK2XMAN=xsltproc --param man.authors.section.enabled 0 /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl
-+DOCBOOK2XMAN=xsltproc --param man.authors.section.enabled 0 /usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl
- 
- all: $(BINS) $(MANS)
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/moreutils.git/commitdiff/78fedf338f787093388d7505211598e898801af4