diff --git a/graphviz-2.44.0-drop-tmsize10-clo.patch b/graphviz-2.44.0-drop-tmsize10-clo.patch new file mode 100644 index 0000000..64fd5d5 --- /dev/null +++ b/graphviz-2.44.0-drop-tmsize10-clo.patch @@ -0,0 +1,311 @@ +From caf6c9f5fed3977d84579e14db99fd9288292f46 Mon Sep 17 00:00:00 2001 +From: Matthew Fernandez +Date: Thu, 29 Apr 2021 19:34:36 -0700 +Subject: [PATCH] remove unused tmsize10.clo + +Fixes #2061. +--- + doc/dotguide/tmsize10.clo | 291 -------------------------------------- + 1 file changed, 291 deletions(-) + delete mode 100644 doc/dotguide/tmsize10.clo + +diff --git a/doc/dotguide/tmsize10.clo b/doc/dotguide/tmsize10.clo +deleted file mode 100644 +index 2d9658706..000000000 +--- a/doc/dotguide/tmsize10.clo ++++ /dev/null +@@ -1,291 +0,0 @@ +-%% +-%% This is file `size10.clo', +-%% generated with the docstrip utility. +-%% +-%% The original source files were: +-%% +-%% classes.dtx (with options: `10pt') +-%% +-%% This is a generated file. +-%% +-%% Copyright 1993 1994 1995 1996 1997 +-%% The LaTeX3 Project and any individual authors listed elsewhere +-%% in this file. +-%% +-%% For further copyright information, and conditions for modification +-%% and distribution, see the file legal.txt, and any other copyright +-%% notices in this file. +-%% +-%% This file is part of the LaTeX2e system. +-%% ---------------------------------------- +-%% This system is distributed in the hope that it will be useful, +-%% but WITHOUT ANY WARRANTY; without even the implied warranty of +-%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +-%% +-%% For error reports concerning UNCHANGED versions of this file no +-%% more than one year old, see bugs.txt. +-%% +-%% Please do not request updates from us directly. Primary +-%% distribution is through the CTAN archives. +-%% +-%% +-%% IMPORTANT COPYRIGHT NOTICE: +-%% +-%% You are NOT ALLOWED to distribute this file alone. +-%% +-%% You are allowed to distribute this file under the condition that it +-%% is distributed together with all the files listed in manifest.txt. +-%% +-%% If you receive only some of these files from someone, complain! +-%% +-%% +-%% Permission is granted to copy this file to another file with a +-%% clearly different name and to customize the declarations in that +-%% copy to serve the needs of your installation, provided that you +-%% comply with the conditions in the file legal.txt. +-%% +-%% However, NO PERMISSION is granted to generate or to distribute a +-%% modified version of this file under its original name. +-%% +-%% You are NOT ALLOWED to change this file. +-%% +-%% +-%% MODIFICATION ADVICE: +-%% +-%% If you want to customize this file, it is best to make a copy of +-%% the source file(s) from which it was produced. Use a different +-%% name for your copy(ies) and modify the copy(ies); this will ensure +-%% that your modifications do not get overwritten when you install a +-%% new release of the standard system. You should also ensure that +-%% your modified source file does not generate any modified file with +-%% the same name as a standard file. +-%% +-%% You can then easily distribute your modifications by distributing +-%% the modified and renamed copy of the source file, taking care to +-%% observe the conditions in legal.txt; this will ensure that other +-%% users can safely use your modifications. +-%% +-%% You will also need to produce your own, suitably named, .ins file to +-%% control the generation of files from your source file; this file +-%% should contain your own preambles for the files it generates, not +-%% those in the standard .ins files. +-%% +-%% The names of the source files used are shown above. +-%% +-%% +-%% +-%% \CharacterTable +-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +-%% Digits \0\1\2\3\4\5\6\7\8\9 +-%% Exclamation \! Double quote \" Hash (number) \# +-%% Dollar \$ Percent \% Ampersand \& +-%% Acute accent \' Left paren \( Right paren \) +-%% Asterisk \* Plus \+ Comma \, +-%% Minus \- Point \. Solidus \/ +-%% Colon \: Semicolon \; Less than \< +-%% Equals \= Greater than \> Question mark \? +-%% Commercial at \@ Left bracket \[ Backslash \\ +-%% Right bracket \] Circumflex \^ Underscore \_ +-%% Grave accent \` Left brace \{ Vertical bar \| +-%% Right brace \} Tilde \~} +-\ProvidesFile{size10.clo} +- [1996/10/31 v1.3u +- Standard LaTeX file (size option)] +-\renewcommand\normalsize{% +- \@setfontsize\normalsize\@xpt\@xiipt +- \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@ +- \abovedisplayshortskip \z@ \@plus3\p@ +- \belowdisplayshortskip 6\p@ \@plus3\p@ \@minus3\p@ +- \belowdisplayskip \abovedisplayskip +- \let\@listi\@listI} +-\normalsize +-\newcommand\small{% +- \@setfontsize\small\@ixpt{11}% +- \abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@ +- \abovedisplayshortskip \z@ \@plus2\p@ +- \belowdisplayshortskip 4\p@ \@plus2\p@ \@minus2\p@ +- \def\@listi{\leftmargin\leftmargini +- \topsep 4\p@ \@plus2\p@ \@minus2\p@ +- \parsep 2\p@ \@plus\p@ \@minus\p@ +- \itemsep \parsep}% +- \belowdisplayskip \abovedisplayskip +-} +-\newcommand\footnotesize{% +- \@setfontsize\footnotesize\@viiipt{9.5}% +- \abovedisplayskip 6\p@ \@plus2\p@ \@minus4\p@ +- \abovedisplayshortskip \z@ \@plus\p@ +- \belowdisplayshortskip 3\p@ \@plus\p@ \@minus2\p@ +- \def\@listi{\leftmargin\leftmargini +- \topsep 3\p@ \@plus\p@ \@minus\p@ +- \parsep 2\p@ \@plus\p@ \@minus\p@ +- \itemsep \parsep}% +- \belowdisplayskip \abovedisplayskip +-} +-\newcommand\scriptsize{\@setfontsize\scriptsize\@viipt\@viiipt} +-\newcommand\tiny{\@setfontsize\tiny\@vpt\@vipt} +-\newcommand\large{\@setfontsize\large\@xiipt{14}} +-\newcommand\Large{\@setfontsize\Large\@xivpt{18}} +-\newcommand\LARGE{\@setfontsize\LARGE\@xviipt{22}} +-\newcommand\huge{\@setfontsize\huge\@xxpt{25}} +-\newcommand\Huge{\@setfontsize\Huge\@xxvpt{30}} +-\if@twocolumn +- \setlength\parindent{1em} +-\else +- \setlength\parindent{15\p@} +-\fi +-\setlength\smallskipamount{3\p@ \@plus 1\p@ \@minus 1\p@} +-\setlength\medskipamount{6\p@ \@plus 2\p@ \@minus 2\p@} +-\setlength\bigskipamount{12\p@ \@plus 4\p@ \@minus 4\p@} +-\setlength\headheight{12\p@} +-\setlength\headsep {25\p@} +-\setlength\topskip {10\p@} +-\setlength\footskip{30\p@} +-\if@compatibility \setlength\maxdepth{4\p@} \else +-\setlength\maxdepth{.5\topskip} \fi +-\if@compatibility +- \if@twocolumn +- \setlength\textwidth{410\p@} +- \else +- \setlength\textwidth{345\p@} +- \fi +-\else +- \setlength\@tempdima{\paperwidth} +- \addtolength\@tempdima{-2in} +- \setlength\@tempdimb{345\p@} +- \if@twocolumn +- \ifdim\@tempdima>2\@tempdimb\relax +- \setlength\textwidth{2\@tempdimb} +- \else +- \setlength\textwidth{\@tempdima} +- \fi +- \else +- \ifdim\@tempdima>\@tempdimb\relax +- \setlength\textwidth{\@tempdimb} +- \else +- \setlength\textwidth{\@tempdima} +- \fi +- \fi +-\fi +-\if@compatibility\else +- \@settopoint\textwidth +-\fi +-\if@compatibility +- \setlength\textheight{43\baselineskip} +-\else +- \setlength\@tempdima{\paperheight} +- \addtolength\@tempdima{-2in} +- \addtolength\@tempdima{-1.5in} +- \divide\@tempdima\baselineskip +- \@tempcnta=\@tempdima +- \setlength\textheight{\@tempcnta\baselineskip} +-\fi +-\addtolength\textheight{\topskip} +-\if@twocolumn +- \setlength\marginparsep {10\p@} +-\else +- \setlength\marginparsep{11\p@} +-\fi +-\setlength\marginparpush{5\p@} +-\if@compatibility +- \if@twoside +- \setlength\oddsidemargin {44\p@} +- \setlength\evensidemargin {82\p@} +- \setlength\marginparwidth {107\p@} +- \else +- \setlength\oddsidemargin {63\p@} +- \setlength\evensidemargin {63\p@} +- \setlength\marginparwidth {90\p@} +- \fi +- \if@twocolumn +- \setlength\oddsidemargin {30\p@} +- \setlength\evensidemargin {30\p@} +- \setlength\marginparwidth {48\p@} +- \fi +-\else +- \if@twoside +- \setlength\@tempdima {\paperwidth} +- \addtolength\@tempdima {-\textwidth} +- \setlength\oddsidemargin {.4\@tempdima} +- \addtolength\oddsidemargin {-1in} +- \setlength\marginparwidth {.6\@tempdima} +- \addtolength\marginparwidth {-\marginparsep} +- \addtolength\marginparwidth {-0.4in} +- \else +- \setlength\@tempdima {\paperwidth} +- \addtolength\@tempdima {-\textwidth} +- \setlength\oddsidemargin {.5\@tempdima} +- \addtolength\oddsidemargin {-1in} +- \setlength\marginparwidth {.5\@tempdima} +- \addtolength\marginparwidth {-\marginparsep} +- \addtolength\marginparwidth {-0.4in} +- \addtolength\marginparwidth {-.4in} +- \fi +- \ifdim \marginparwidth >2in +- \setlength\marginparwidth{2in} +- \fi +- \@settopoint\oddsidemargin +- \@settopoint\marginparwidth +- \setlength\evensidemargin {\paperwidth} +- \addtolength\evensidemargin{-2in} +- \addtolength\evensidemargin{-\textwidth} +- \addtolength\evensidemargin{-\oddsidemargin} +- \@settopoint\evensidemargin +-\fi +-\if@compatibility +- \setlength\topmargin{27pt} +-\else +- \setlength\topmargin{\paperheight} +- \addtolength\topmargin{-2in} +- \addtolength\topmargin{-\headheight} +- \addtolength\topmargin{-\headsep} +- \addtolength\topmargin{-\textheight} +- \addtolength\topmargin{-\footskip} % this might be wrong! +- \addtolength\topmargin{-.5\topmargin} +- \@settopoint\topmargin +-\fi +-\setlength\footnotesep{6.65\p@} +-\setlength{\skip\footins}{9\p@ \@plus 4\p@ \@minus 2\p@} +-\setlength\floatsep {12\p@ \@plus 2\p@ \@minus 2\p@} +-\setlength\textfloatsep{20\p@ \@plus 2\p@ \@minus 4\p@} +-\setlength\intextsep {12\p@ \@plus 2\p@ \@minus 2\p@} +-\setlength\dblfloatsep {12\p@ \@plus 2\p@ \@minus 2\p@} +-\setlength\dbltextfloatsep{20\p@ \@plus 2\p@ \@minus 4\p@} +-\setlength\@fptop{0\p@ \@plus 1fil} +-\setlength\@fpsep{8\p@ \@plus 2fil} +-\setlength\@fpbot{0\p@ \@plus 1fil} +-\setlength\@dblfptop{0\p@ \@plus 1fil} +-\setlength\@dblfpsep{8\p@ \@plus 2fil} +-\setlength\@dblfpbot{0\p@ \@plus 1fil} +-\setlength\partopsep{2\p@ \@plus 1\p@ \@minus 1\p@} +-\def\@listi{\leftmargin\leftmargini +- \parsep 4\p@ \@plus2\p@ \@minus\p@ +- \topsep 8\p@ \@plus2\p@ \@minus4\p@ +- \itemsep4\p@ \@plus2\p@ \@minus\p@} +-\let\@listI\@listi +-\@listi +-\def\@listii {\leftmargin\leftmarginii +- \labelwidth\leftmarginii +- \advance\labelwidth-\labelsep +- \topsep 4\p@ \@plus2\p@ \@minus\p@ +- \parsep 2\p@ \@plus\p@ \@minus\p@ +- \itemsep \parsep} +-\def\@listiii{\leftmargin\leftmarginiii +- \labelwidth\leftmarginiii +- \advance\labelwidth-\labelsep +- \topsep 2\p@ \@plus\p@\@minus\p@ +- \parsep \z@ +- \partopsep \p@ \@plus\z@ \@minus\p@ +- \itemsep \topsep} +-\def\@listiv {\leftmargin\leftmarginiv +- \labelwidth\leftmarginiv +- \advance\labelwidth-\labelsep} +-\def\@listv {\leftmargin\leftmarginv +- \labelwidth\leftmarginv +- \advance\labelwidth-\labelsep} +-\def\@listvi {\leftmargin\leftmarginvi +- \labelwidth\leftmarginvi +- \advance\labelwidth-\labelsep} +-\endinput +-%% +-%% End of file `size10.clo'. +-- +GitLab + diff --git a/graphviz.spec b/graphviz.spec index 10a05c8..e6b2185 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -68,7 +68,7 @@ Name: graphviz Summary: Graph Visualization Tools Version: 2.44.0 -Release: 19%{?dist} +Release: 20%{?dist} License: EPL-1.0 URL: http://www.graphviz.org/ Source0: https://gitlab.com/%{name}/%{name}/-/archive/%{version}/%{name}-%{version}.tar.bz2 @@ -77,6 +77,8 @@ Patch0: graphviz-2.42.2-dotty-menu-fix.patch Patch1: graphviz-2.42.2-coverity-scan-fixes.patch # rhbz#1612692, https://gitlab.com/graphviz/graphviz/-/merge_requests/1367 Patch2: graphviz-2.44.0-man-fix.patch +# https://gitlab.com/graphviz/graphviz/-/issues/2061 +Patch3: graphviz-2.44.0-drop-tmsize10-clo.patch BuildRequires: gcc-g++ BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, expat-devel, freetype-devel >= 2 BuildRequires: ksh, bison, m4, flex, tk-devel, tcl-devel >= 8.3, swig, sed @@ -298,6 +300,7 @@ Various tcl packages (extensions) for the graphviz tools. %patch0 -p1 -b .dotty-menu-fix %patch1 -p1 -b .coverity-scan-fixes %patch2 -p1 -b .man-fix +%patch3 -p1 -b .drop-tmsize10-clo # Attempt to fix rpmlint warnings about executable sources find -type f -regex '.*\.\(c\|h\)$' -exec chmod a-x {} ';' @@ -602,6 +605,10 @@ php --no-php-ini \ %{_mandir}/man3/*.3tcl* %changelog +* Wed May 12 2021 Jaroslav Škarvada - 2.44.0-20 +- Dropped unneeded tmsize10.clo file + Resolves: rhbz#1955686 + * Fri May 7 2021 Jaroslav Škarvada - 2.44.0-19 - Conditionalized guile support Resolves: rhbz#1953974