[packages/moreutils] - updated to 0.51 - updated make patch

qboosh qboosh at pld-linux.org
Mon Mar 3 07:48:20 CET 2014


commit 1b1faa41cfd128154193aaa2f16c88a46a9d9c01
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Mar 3 07:51:00 2014 +0100

    - updated to 0.51
    - updated make patch

 moreutils-make.patch | 10 +++++-----
 moreutils.spec       | 16 +++++++---------
 2 files changed, 12 insertions(+), 14 deletions(-)
---
diff --git a/moreutils.spec b/moreutils.spec
index e9c73f2..a43faf9 100644
--- a/moreutils.spec
+++ b/moreutils.spec
@@ -1,16 +1,18 @@
 Summary:	A collection of unix tools
 Summary(pl.UTF-8):	Zestaw narzędzi uniksowych
 Name:		moreutils
-Version:	0.50
+Version:	0.51
 Release:	1
 License:	GPL v2+
 Group:		Applications/System
 Source0:	http://ftp.debian.org/debian/pool/main/m/moreutils/%{name}_%{version}.tar.gz
-# Source0-md5:	d98df84a188e0e9c58b06c0fcab48f98
+# Source0-md5:	849282ea7e43ed01d34bd81b1d2be283
 Patch0:		%{name}-make.patch
 URL:		http://joeyh.name/code/moreutils/
-BuildRequires:	docbook-dtd44-sgml
-BuildRequires:	docbook2X
+BuildRequires:	docbook-dtd44-xml
+BuildRequires:	docbook-style-xsl
+BuildRequires:	libxml2-progs
+BuildRequires:	libxslt-progs
 BuildRequires:	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -64,14 +66,10 @@ narzędzia:
 %setup -q -n %{name}
 %patch0 -p1
 
-# adjust paths to PLD
-%{__sed} -i -e 's,"file:///.*docbookx\.dtd","/usr/share/sgml/docbook/xml-dtd-4.4/docbookx.dtd",' *.docbook
-
 %build
 %{__make} \
 	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags} -Wall" \
-	DOCBOOK2XMAN=docbook2X2man
+	CFLAGS="%{rpmcflags} -Wall"
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/moreutils-make.patch b/moreutils-make.patch
index 2c3665d..5d6a6b2 100644
--- a/moreutils-make.patch
+++ b/moreutils-make.patch
@@ -1,11 +1,11 @@
---- moreutils/Makefile~	2010-10-29 22:47:09.000000000 +0300
-+++ moreutils/Makefile	2011-05-28 13:21:13.315371896 +0300
+--- 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
+ PREFIX?=/usr
  
--DOCBOOK2XMAN=docbook2x-man
-+DOCBOOK2XMAN=docbook2man
+-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/1b1faa41cfd128154193aaa2f16c88a46a9d9c01



More information about the pld-cvs-commit mailing list