New version 0.9.82

Signed-off-by: Julien Rische <jrische@redhat.com>
This commit is contained in:
Julien Rische 2023-02-06 00:13:07 +01:00
parent 7021294614
commit 77f027995c
7 changed files with 78 additions and 43 deletions

1
.gitignore vendored
View File

@ -2,3 +2,4 @@ linuxdoc-tools_0.9.66.tar.gz
/linuxdoc-tools_0.9.67.tar.gz /linuxdoc-tools_0.9.67.tar.gz
/linuxdoc-tools_0.9.68.tar.gz /linuxdoc-tools_0.9.68.tar.gz
/linuxdoc-tools_0.9.72.orig.tar.gz /linuxdoc-tools_0.9.72.orig.tar.gz
/linuxdoc-tools_0.9.82.orig.tar.gz

View File

@ -0,0 +1,41 @@
From 2f2699aa819103cd53b95230af7bc1f6b6b8644b Mon Sep 17 00:00:00 2001
From: Julien Rische <jrische@redhat.com>
Date: Sun, 5 Feb 2023 23:26:06 +0100
Subject: [PATCH] [downstream] Changed default papersize to letter
---
man/linuxdoc.1 | 4 ++--
perl5lib/LinuxDocTools.pm | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/man/linuxdoc.1 b/man/linuxdoc.1
index 8fb9438..eb9706f 100644
--- a/man/linuxdoc.1
+++ b/man/linuxdoc.1
@@ -46,8 +46,8 @@ Set the backend for specified format. Default is none of the actual
format, but just output the usage of this suites.
Available formats are: html, info, latex, lyx, rtf, txt, check.
.IP "--papersize=\fIsize\fR, -p
-Set the paper size. Default is ``a4'' (European 297x210mm paper).
-You may also specify ``letter'' size.
+Set the paper size. Default is ``letter''.
+You may also specify ``a4'' size (European 297x210mm paper).
.IP "--language=\fIlang\fR, -l"
Specify the language of the document (this may change which style
files are used for formatting by a back end). The default language is
diff --git a/perl5lib/LinuxDocTools.pm b/perl5lib/LinuxDocTools.pm
index b6e6e57..d3f0cfe 100644
--- a/perl5lib/LinuxDocTools.pm
+++ b/perl5lib/LinuxDocTools.pm
@@ -203,7 +203,7 @@ sub init {
{ option => "pass", type => "s", short => "P" }
];
$global->{backend} = "linuxdoc";
- $global->{papersize} = "a4";
+ $global->{papersize} = "letter";
$global->{language} = '';
$global->{charset} = "ascii";
$global->{style} = "";
--
2.39.1

View File

@ -0,0 +1,25 @@
From 453fa2fb9d10c2ded7a46d550592f79dd7653e39 Mon Sep 17 00:00:00 2001
From: Julien Rische <jrische@redhat.com>
Date: Sun, 5 Feb 2023 23:30:27 +0100
Subject: [PATCH] [downstream] Added fix to have lib64 in perl path on
64bit machine
---
bin/linuxdoc.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/bin/linuxdoc.in b/bin/linuxdoc.in
index 615ef06..3d3455f 100755
--- a/bin/linuxdoc.in
+++ b/bin/linuxdoc.in
@@ -12,6 +12,7 @@ use 5.006;
use strict;
use lib "@pkgdatadir@";
+use lib "@prefix@/lib64/perl5";
use lib "@perl5libdir@";
use LinuxDocTools::Utils qw{ldt_which};
--
2.39.1

View File

@ -1,24 +0,0 @@
--- linuxdoc-tools-0.9.13/perl5lib/LinuxDocTools.pm.letter Mon Nov 26 16:09:37 2001
+++ linuxdoc-tools-0.9.13/perl5lib/LinuxDocTools.pm Mon Nov 26 16:09:49 2001
@@ -108,7 +108,7 @@
{ option => "pass", type => "s", short => "P" }
];
$global->{backend} = "linuxdoc";
- $global->{papersize} = "a4";
+ $global->{papersize} = "letter";
$global->{language} = "en";
$global->{charset} = "ascii";
$global->{style} = "";
--- linuxdoc-tools-0.9.13/man/linuxdoc.1.letter Mon Nov 26 16:10:04 2001
+++ linuxdoc-tools-0.9.13/man/linuxdoc.1 Mon Nov 26 16:10:42 2001
@@ -46,8 +46,8 @@
format, but just output the usage of this suites.
Available formats are: html, info, latex, lyx, rtf, txt, check.
.IP "--papersize=\fIsize\fR, -p
-Set the paper size. Default is ``a4'' (European 297x210mm paper).
-You may also specify ``letter'' size.
+Set the paper size. Default is ``letter''.
+You may also specify ``a4'' size (European 297x210mm paper).
.IP "--language=\fIlang\fR, -l"
Specify the language of the document (this may change which style
files are used for formatting by a back end). The default language is

View File

@ -1,10 +0,0 @@
--- linuxdoc-tools-0.9.60/bin/linuxdoc.in.orig
+++ linuxdoc-tools-0.9.60/bin/linuxdoc.in
@@ -23,6 +23,7 @@
$AuxBinDir = "@auxbindir@";
use lib "@pkgdatadir@";
+use lib "@prefix@/lib64/perl5";
use lib "@perl5libdir@";
# ---------------------------------------------------------------------

View File

@ -4,14 +4,14 @@
Summary: A text formatting package based on SGML Summary: A text formatting package based on SGML
Name: linuxdoc-tools Name: linuxdoc-tools
Version: 0.9.72 Version: 0.9.82
Release: 15%{?dist} Release: 1%{?dist}
License: MIT License: MIT
Source: http://http.us.debian.org/debian/pool/main/l/linuxdoc-tools/%{name}_%{version}.orig.tar.gz Source: http://http.us.debian.org/debian/pool/main/l/linuxdoc-tools/%{name}_%{version}.orig.tar.gz
Patch0: linuxdoc-tools-0.9.13-letter.patch Patch01: 0001-downstream-Changed-default-papersize-to-letter.patch
Patch1: linuxdoc-tools-0.9.20-lib64.patch Patch02: 0002-downstream-Added-fix-to-have-lib64-in-perl-path-on-6.patch
Url: http://packages.qa.debian.org/l/linuxdoc-tools.html Url: http://packages.qa.debian.org/l/linuxdoc-tools.html
BuildRequires: gcc BuildRequires: git gcc
BuildRequires: flex flex-static sgml-common jade gawk groff autoconf automake texinfo BuildRequires: flex flex-static sgml-common jade gawk groff autoconf automake texinfo
#need actual perl directory structure #need actual perl directory structure
BuildRequires: perl-interpreter >= 4:5.10.1 BuildRequires: perl-interpreter >= 4:5.10.1
@ -38,9 +38,7 @@ source. Linuxdoc-tools is intended for writing technical software
documentation. documentation.
%prep %prep
%setup -q %autosetup -S git
%patch0 -p1
%patch1 -p1 -b .lib64
%build %build
#need to get config.{sub,guess} in, something is broken in the build #need to get config.{sub,guess} in, something is broken in the build
@ -100,9 +98,13 @@ exit 0
%dir %{_vendorperllibdir}/LinuxDocTools %dir %{_vendorperllibdir}/LinuxDocTools
%{_vendorperllibdir}/LinuxDocTools.pm %{_vendorperllibdir}/LinuxDocTools.pm
%{_vendorperllibdir}/LinuxDocTools/*.pm %{_vendorperllibdir}/LinuxDocTools/*.pm
%{_vendorperllibdir}/LinuxDocTools/Data/*.pm
%{_mandir}/*/* %{_mandir}/*/*
%changelog %changelog
* Sun Feb 05 2023 Julien Rische <jrische@redhat.com> - 0.9.82-1
- New version 0.9.82
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.72-15 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.72-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (linuxdoc-tools_0.9.72.orig.tar.gz) = 6316289742694f5c8160e9e72a3b85043c65a1bf33bf166b9e62cabc485b715a0ca946c9f13b52a58e03d816f421cb635319231c5d7e497e21bbbc5af17ad9ca SHA512 (linuxdoc-tools_0.9.82.orig.tar.gz) = f32952d5b18222c2217e4dc45f2b357ad7074a4e33869c2c6f7bae9c8b7e131f4f0faecf7d61ece63566a8de76a6de3fb84261d6e7cfb56fea625952b4947a66