diff --git a/0001-Change-docbook-XML-path-for-Fedora.patch b/0001-Change-docbook-XML-path-for-Fedora.patch new file mode 100644 index 0000000..2e47779 --- /dev/null +++ b/0001-Change-docbook-XML-path-for-Fedora.patch @@ -0,0 +1,25 @@ +From d61478449e09de910c215fa3eabd98b0e9341a8f Mon Sep 17 00:00:00 2001 +From: "Ryan S. Brown" +Date: Thu, 3 Dec 2015 14:24:27 -0500 +Subject: [PATCH 1/1] Change docbook XML path for Fedora + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 4f8af10..0aa89a7 100644 +--- a/Makefile ++++ b/Makefile +@@ -5,7 +5,7 @@ CFLAGS?=-O2 -g -Wall + 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/profile-docbook.xsl + + all: $(BINS) $(MANS) + +-- +2.4.3 + diff --git a/moreutils.spec b/moreutils.spec index 72f8727..ed65110 100644 --- a/moreutils.spec +++ b/moreutils.spec @@ -1,14 +1,16 @@ Name: moreutils -Version: 0.49 -Release: 5%{?dist} +Version: 0.57 +Release: 1%{?dist} Summary: Additional unix utilities Group: Applications/System License: GPLv2 URL: http://kitenet.net/~joey/code/moreutils/ -Source0: http://ftp.debian.org/debian/pool/main/m/%{name}/%{name}_%{version}.tar.gz +Source0: http://ftp.debian.org/debian/pool/main/m/%{name}/%{name}_%{version}.orig.tar.gz +# fixes docbook XSL path +Patch0001: 0001-Change-docbook-XML-path-for-Fedora.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: docbook2X docbook-dtds libxml2 perl-podlators -Requires: perl-TimeDate perl-Time-Duration +BuildRequires: docbook2X docbook-dtds libxml2 perl-podlators docbook-style-xsl +Requires: perl-TimeDate perl-Time-Duration perl-Time-HiRes # These perl modules add functionality to the ts command, as they are added in eval'd code they are not # picked up automatically by rpm. @@ -47,7 +49,8 @@ Requires: %{name} = %{version}-%{release} %prep -%setup -qn %{name} +%setup -q -n %{name}-%{version} +%patch1 -p1 # the required dtd's are not where this package expects them to be, let's fix that DTDFILE=`xmlcatalog /usr/share/sgml/docbook/xmlcatalog "-//OASIS//DTD DocBook XML V4.4//EN" "-//OASIS//DTD DocBook XML V4.3//EN"|grep -v "No entry"|head -n1` sed -r -i "s|/usr/share/xml/docbook/schema/dtd/4.4/docbookx.dtd|$DTDFILE|" *.docbook @@ -141,6 +144,9 @@ rm -rf %{buildroot} %changelog +* Thu Dec 03 2015 Fedora Release Engineering - 0.57-1 +- Update to 0.57 upstream release + * Wed Jun 17 2015 Fedora Release Engineering - 0.49-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild