Compare commits

..

No commits in common. 'i10cs' and 'c9' have entirely different histories.
i10cs ... c9

2
.gitignore vendored

@ -1 +1 @@
SOURCES/linuxdoc-tools_0.9.82.orig.tar.gz
SOURCES/linuxdoc-tools_0.9.72.orig.tar.gz

@ -1 +1 @@
8cefe8236d66e7b4f51afa52db1fdfe6e320b4c5 SOURCES/linuxdoc-tools_0.9.82.orig.tar.gz
f42b0fcb7062d216b8b0bd7b7bc2a4ce091cf4cf SOURCES/linuxdoc-tools_0.9.72.orig.tar.gz

@ -1,41 +0,0 @@
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

@ -1,25 +0,0 @@
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

@ -0,0 +1,24 @@
--- 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

@ -0,0 +1,10 @@
--- 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@";
# ---------------------------------------------------------------------

@ -1,40 +0,0 @@
From f7b501c2dd7170d45f92a8678a84d2228cd9e6a4 Mon Sep 17 00:00:00 2001
From: rpm-build <rpm-build>
Date: Sun, 21 Jan 2024 19:29:25 +0100
Subject: [PATCH] Correct function prototype for signal handers in sgmls
configure
Content-type: text/plain
This avoids altering the outcome of the checks with GCC 14 and Clang 16.
Submitted upstream: <https://bugs.debian.org/1061266>
---
sgmls-1.1/configure | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sgmls-1.1/configure b/sgmls-1.1/configure
index e674d24..898b522 100755
--- a/sgmls-1.1/configure
+++ b/sgmls-1.1/configure
@@ -113,7 +113,7 @@ cat >doit.c <<\EOF
#include <stdlib.h>
#include <unistd.h>
-static int whoops()
+static void whoops(int signo)
{
_exit(1);
}
@@ -459,7 +459,7 @@ cat >doit.c <<\EOF
#include <unistd.h>
#include <string.h>
-static int whoops()
+static void whoops(int signo)
{
_exit(1);
}
--
2.43.0

@ -1,296 +0,0 @@
From 0771d5d9a49ccd2e4c10ce1fe9bb14b7f69d4081 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Thu, 13 Apr 2023 18:09:27 +0200
Subject: [PATCH] sgmls: Avoid implicit ints/function declarations in configure
Content-type: text/plain
These C features are no longer part of C99, and future compilers
will no longer support them by default, causing the build to fail.
The changes assume that the usual system headers (<stdlib.h>,
<unistd.h>) are present, but that should not be a problem on current
systems.
Submitted upstream: <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1034362>
---
sgmls-1.1/configure | 60 +++++++++++++++++++++++++++++++--------------
1 file changed, 42 insertions(+), 18 deletions(-)
diff --git a/sgmls-1.1/configure b/sgmls-1.1/configure
index 5d3e197..e674d24 100755
--- a/sgmls-1.1/configure
+++ b/sgmls-1.1/configure
@@ -110,13 +110,15 @@ cat >doit.c <<\EOF
#include <ctype.h>
#include <signal.h>
+#include <stdlib.h>
+#include <unistd.h>
static int whoops()
{
_exit(1);
}
-main()
+int main(void)
{
int c;
#ifdef isascii
@@ -213,13 +215,15 @@ else
fi
cat >doit.c <<\EOF
+#include <stdio.h>
+int
main(argc, argv)
int argc;
char **argv;
{
if (argc == 0)
remove("foo");
- exit(0);
+ return 0;
}
EOF
@@ -231,13 +235,15 @@ else
fi
cat >doit.c <<\EOF
+#include <unistd.h>
+int
main(argc, argv)
int argc;
char **argv;
{
if (argc == 0)
getopt(argc, argv, "v");
- exit(0);
+ return 0;
}
EOF
@@ -248,14 +254,16 @@ else
off="$off HAVE_GETOPT"
fi
-cat >doit.c <<\EOF
+cat>doit.c <<\EOF
+#include <unistd.h>
+int
main(argc, argv)
int argc;
char **argv;
{
if (argc == 0)
access("foo", 4);
- exit(0);
+ return 0;
}
EOF
@@ -267,13 +275,15 @@ else
fi
cat >doit.c <<\EOF
+#include <unistd.h>
+int
main(argc, argv)
int argc;
char **argv;
{
if (argc == 0)
vfork();
- exit(0);
+ return 0;
}
EOF
@@ -285,6 +295,8 @@ else
fi
cat >doit.c <<\EOF
+#include <sys/wait.h>
+int
main(argc, argv)
int argc;
char **argv;
@@ -294,7 +306,7 @@ char **argv;
int status;
waitpid(-1, &status, 0);
}
- exit(0);
+ return 0;
}
EOF
@@ -307,13 +319,14 @@ fi
cat >doit.c <<\EOF
#include <string.h>
+int
main(argc, argv)
int argc;
char **argv;
{
if (argc == 0)
strerror(0);
- exit(0);
+ return 0;
}
EOF
@@ -326,13 +339,14 @@ fi
cat >doit.c <<\EOF
#include <strings.h>
+int
main(argc, argv)
int argc;
char **argv;
{
if (argc == 0)
bcopy((char *)0, (char *)0, 0);
- exit(0);
+ return 0;
}
EOF
@@ -341,13 +355,14 @@ then
# Only use BSD_STRINGS if ANSI string functions don't work.
cat >doit.c <<\EOF
#include <string.h>
+int
main(argc, argv)
int argc;
char **argv;
{
if (argc == 0)
memcpy((char *)0, (char *)0, 0);
- exit(0);
+ return 0;
}
EOF
@@ -363,13 +378,14 @@ fi
cat >doit.c <<\EOF
#include <signal.h>
+int
main(argc, argv)
int argc;
char **argv;
{
if (argc == 0)
raise(SIGINT);
- exit(0);
+ return 0;
}
EOF
@@ -382,6 +398,7 @@ fi
cat >doit.c <<\EOF
#include <stdio.h>
+int
main(argc, argv)
int argc;
char **argv;
@@ -391,7 +408,7 @@ char **argv;
fsetpos(stdin, &pos);
fgetpos(stdin, &pos);
}
- exit(0);
+ return 0;
}
EOF
@@ -407,6 +424,7 @@ cat >doit.c <<\EOF
#include <sys/types.h>
#include <sys/wait.h>
+int
main(argc, argv)
int argc;
char **argv;
@@ -423,7 +441,7 @@ char **argv;
WTERMSIG(status);
WSTOPSIG(status);
}
- exit(0);
+ return 0;
}
EOF
@@ -437,13 +455,16 @@ fi
cat >doit.c <<\EOF
#include <stdio.h>
#include <signal.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
static int whoops()
{
_exit(1);
}
-main()
+int main(void)
{
char buf[30];
#ifdef SIGSEGV
@@ -470,6 +491,7 @@ fi
cat >doit.c <<\EOF
#include <nl_types.h>
+int
main(argc, argv)
int argc;
char **argv;
@@ -479,7 +501,7 @@ char **argv;
catgets(d, 1, 1, "default");
catclose(d);
}
- exit(0);
+ return 0;
}
EOF
@@ -492,9 +514,11 @@ fi
cat >doit.c <<\EOF
#include <limits.h>
+#include <stdlib.h>
char c = UCHAR_MAX;
+int
main(argc, argv)
int argc;
char **argv;
@@ -512,16 +536,16 @@ then
char_signed=
else
cat >doit.c <<\EOF
-main()
+int main(void)
{
int i;
for (i = 0; i < 512; i++) {
char c = (char)i;
if (c < 0)
- exit(1);
+ return 1;
}
- exit(0);
+ return 0;
}
EOF
--
2.39.2

@ -4,16 +4,14 @@
Summary: A text formatting package based on SGML
Name: linuxdoc-tools
Version: 0.9.82
Release: 9%{?dist}
License: X11-distribute-modifications-variant
Version: 0.9.72
Release: 13%{?dist}
License: MIT
Source: http://http.us.debian.org/debian/pool/main/l/linuxdoc-tools/%{name}_%{version}.orig.tar.gz
Patch01: 0001-downstream-Changed-default-papersize-to-letter.patch
Patch02: 0002-downstream-Added-fix-to-have-lib64-in-perl-path-on-6.patch
Patch3: linuxdoc-tools-c99.patch
Patch4: linuxdoc-tools-c89.patch
Patch0: linuxdoc-tools-0.9.13-letter.patch
Patch1: linuxdoc-tools-0.9.20-lib64.patch
Url: http://packages.qa.debian.org/l/linuxdoc-tools.html
BuildRequires: git gcc
BuildRequires: gcc
BuildRequires: flex flex-static sgml-common jade gawk groff autoconf automake texinfo
#need actual perl directory structure
BuildRequires: perl-interpreter >= 4:5.10.1
@ -40,7 +38,9 @@ source. Linuxdoc-tools is intended for writing technical software
documentation.
%prep
%autosetup -S git
%setup -q
%patch0 -p1
%patch1 -p1 -b .lib64
%build
#need to get config.{sub,guess} in, something is broken in the build
@ -100,52 +100,15 @@ exit 0
%dir %{_vendorperllibdir}/LinuxDocTools
%{_vendorperllibdir}/LinuxDocTools.pm
%{_vendorperllibdir}/LinuxDocTools/*.pm
%{_vendorperllibdir}/LinuxDocTools/Data/*.pm
%{_mandir}/*/*
%changelog
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 0.9.82-9
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.9.72-13
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 0.9.82-8
- Rebuilt for MSVSphere 10
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.9.82-8
- Bump release for June 2024 mass rebuild
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.82-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Florian Weimer <fweimer@redhat.com> - 0.9.82-6
- Silent miscompilation with GCC 14 due to C89 compatibility issue
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.82-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Oct 23 2023 Ondrej Sloup <osloup@redhat.com> - 0.9.82-4
- Update license tag to the SPDX format
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.82-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Apr 13 2023 Florian Weimer <fweimer@redhat.com> - 0.9.82-2
- Port sgmls non-autoconf configure script to C99
* 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
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.72-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.72-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.72-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.9.72-12
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.72-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Loading…
Cancel
Save