PR#2: Rebuilt for RedHat 8. - rpms/moreutils

rpms / moreutils

#2 Rebuilt for RedHat 8.

Closed 2 years ago by brandfbb. Opened 4 years ago by brandfbb.

rpms/ brandfbb/moreutils master into rawhide

Rebuilt for RedHat 8.

Breno Brand Fernandes • 4 years ago

5a2d74a

0001-Change-docbook-XML-path-for-Fedora.patch

file removed

-25

		`@@ -1,25 +0,0 @@`
		`- From d61478449e09de910c215fa3eabd98b0e9341a8f Mon Sep 17 00:00:00 2001`
		`- From: "Ryan S. Brown" <sb@ryansb.com>`
		`- 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`
		`-`

0001-Change-docbook-XSL-path-for-Rhel8.patch

file added

+14

		`@@ -0,0 +1,14 @@`
		`+ --- Makefile 2019-01-09 10:14:34.000000000 -0500`
		`+ +++ Makefile 2019-08-27 09:36:49.465727725 -0400`
		`+ @@ -5,11 +5,7 @@`
		`+ INSTALL_BIN?=install -s`
		`+ PREFIX?=/usr`
		`+`
		`+ -ifneq (,$(findstring CYGWIN,$(shell uname)))`
		`+ DOCBOOKXSL?=/usr/share/sgml/docbook/xsl-stylesheets`
		`+ -else`
		`+ - DOCBOOKXSL?=/usr/share/xml/docbook/stylesheet/docbook-xsl`
		`+ -endif`
		`+`
		`+ DOCBOOK2XMAN=xsltproc --param man.authors.section.enabled 0 $(DOCBOOKXSL)/manpages/docbook.xsl`
		`+`

moreutils.spec

file modified

+9 -5

		`@@ -1,12 +1,12 @@`
		`Name: moreutils`
		`- Version: 0.57`
		`- Release: 11%{?dist}`
		`+ Version: 0.63`
		`+ Release: 1%{?dist}`
		`Summary: Additional unix utilities`
		`License: GPLv2`
		`URL: http://kitenet.net/~joey/code/moreutils/`
		`- Source0: http://ftp.debian.org/debian/pool/main/m/%{name}/%{name}_%{version}.orig.tar.gz`
		`+ Source0: http://ftp.debian.org/debian/pool/main/m/%{name}/%{name}_%{version}.orig.tar.xz`
		`# fixes docbook XSL path`
		`- Patch0001: 0001-Change-docbook-XML-path-for-Fedora.patch`
		`+ Patch0001: 0001-Change-docbook-XSL-path-for-Rhel8.patch`
		`BuildRequires: gcc`
		`BuildRequires: docbook2X docbook-dtds libxml2 perl-generators perl-podlators docbook-style-xsl`
		`Requires: perl-TimeDate perl-Time-Duration perl-Time-HiRes perl-IPC-Run`
		`@@ -14,6 +14,7 @@`
		`# picked up automatically by rpm.`

		`%description`
		`+`
		`This is a growing collection of the unix tools that nobody thought`
		`to write thirty years ago.`

		`@@ -48,7 +49,7 @@`

		`%prep`
		`%setup -q -n %{name}-%{version}`
		`- %patch1 -p1`
		`+ %patch1 -p0`
		`# 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`
		`@@ -137,6 +138,9 @@`


		`%changelog`
		`+ * Tue Aug 27 2018 Breno Fernandes <brandfbb@gmail.com> - 0.63-1`
		`+ - Rebuilt for RedHat 8.`
		`+`
		`* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.57-11`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild`

brandfbb commented 4 years ago

This is a rebuilt for RedHat 8.
Small changes.

brandfbb commented 4 years ago

FYI: I am also rebuilding perl-Time-Duration, which is a dep in order to get moreutils installed.

brandfbb commented 4 years ago

Oh, also realized there's a new line with no purpose.
Feel free to remove it. I did so many debugs trying to make fedpkg work that ended leaving that there.

mikelo2 commented 2 years ago

@brandfbb is that patch still required? if not, package has been update to 0.63 for epel8 and PR could be closed. Package can be also updated to 0.67, but that would be another PR i guess.

brandfbb commented 2 years ago

well, i guess you are 2 years late. probably not.

Pull-Request has been closed by brandfbb

2 years ago