From 222b9f9d0a8a733b414ba93b5324441034b44abf Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova <jples...@redhat.com> Date: Fri, 9 Dec 2016 11:57:09 +0100 Subject: Revert "1.20160626 bump"
This reverts commit b8f7ba1f8d7e9381f318280907c6d58f6820e774. --- .gitignore | 1 - Pod-PseudoPod-LaTeX-1.20110710.patch | 204 +++++++++++++++++++++++++++++++++++ perl-Pod-PseudoPod-LaTeX.spec | 46 ++++---- sources | 2 +- 4 files changed, 229 insertions(+), 24 deletions(-) create mode 100644 Pod-PseudoPod-LaTeX-1.20110710.patch diff --git a/.gitignore b/.gitignore index cff753a..580dce5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ Pod-PseudoPod-LaTeX-1.000.tar.gz /Pod-PseudoPod-LaTeX-1.20110710.tar.gz -/Pod-PseudoPod-LaTeX-1.20160626.tar.gz diff --git a/Pod-PseudoPod-LaTeX-1.20110710.patch b/Pod-PseudoPod-LaTeX-1.20110710.patch new file mode 100644 index 0000000..9871ee9 --- /dev/null +++ b/Pod-PseudoPod-LaTeX-1.20110710.patch @@ -0,0 +1,204 @@ +--- lib/Pod/PseudoPod/LaTeX.pm 2011-07-11 00:20:52.000000000 +0200 ++++ lib/Pod/PseudoPod/LaTeX.pm 2016-02-12 12:46:21.254244485 +0100 +@@ -382,7 +382,7 @@ + + $self->{scratch} .= "\\vspace{-6pt}\n" + . "\\scriptsize\n" +- . "\\begin{Verbatim}[$verb_options]\n"; ++ . "\\begin{verbatim}[$verb_options]\n"; + $self->{flags}{in_verbatim}++; + } + +@@ -390,7 +390,7 @@ + { + my $self = shift; + +- $self->{scratch} .= "\n\\end{Verbatim}\n" ++ $self->{scratch} .= "\n\\end{verbatim}\n" + . "\\vspace{-6pt}\n"; + + # $self->{scratch} .= "\\addtolength{\\parskip}{5pt}\n"; +--- t/sections.t 2011-07-11 00:20:52.000000000 +0200 ++++ t/sections.t.new 2016-02-13 02:16:50.620630461 +0100 +@@ -18,53 +18,53 @@ + $fh->setpos(0); + my $text = join( '', <$fh> ); + +-like( $text, qr/\\chapter{Some Document}/, ++like( $text, qr/\\chapter\{Some Document\}/, + '0 heads should become chapter titles' ); + +-like( $text, qr/\\section\*{A Heading}/, ++like( $text, qr/\\section\*\{A Heading\}/, + 'A heads should become section titles' ); + +-like( $text, qr/\\subsection\*{B heading}/, ++like( $text, qr/\\subsection\*\{B heading\}/, + 'B heads should become subsection titles' ); + +-like( $text, qr/\\subsubsection\*{c heading}/, ++like( $text, qr/\\subsubsection\*\{c heading\}/, + 'C heads should become subsubsection titles' ); + +-like( $text, qr/\\begin{Verbatim}.+"This text.+--.+\$text."\n\\end{Verbatim}/s, ++like( $text, qr/\\begin\{verbatim\}.+"This text.+--.+\$text."\n\\end\{verbatim\}/s, + 'programlistings should become unescaped, verbatim text' ); + +-like( $text, qr/\\begin{Verbatim}.*label=.+This should also be \$unm0d\+ified\n\\end{Verbatim}/s, ++like( $text, qr/\\begin\{verbatim\}.*label=.+This should also be \$unm0d\+ified\n\\end\{verbatim\}/s, + 'screens should become unescaped, verbatim text' ); + + like( $text, qr/Blockquoted text.+``escaped''\./, + 'blockquoted text gets escaped' ); + +-like( $text, qr/\\begin{description}.+\\item\[\] Verbatim\n\n/s, ++like( $text, qr/\\begin\{description\}.+\\item\[\] Verbatim\n\n/s, + 'text-item lists need description formatting to start' ); + +-like( $text, qr/\\item\[\] items\n\n\\end{description}/, ++like( $text, qr/\\item\[\] items\n\n\\end\{description\}/, + '... and to end' ); + +-like( $text, qr/rule too:\n\n.+?\\begin{itemize}.+?\\item BANG\n\n/s, ++like( $text, qr/rule too:\n\n.+?\\begin\{itemize\}.+?\\item BANG\n\n/s, + 'bulleted lists need itemized formatting to start' ); + +-like( $text, qr/\\item BANGERANG!\n\n\\end{itemize}/, ++like( $text, qr/\\item BANGERANG!\n\n\\end\{itemize\}/, + '... and to end' ); + + like( $text, +- qr/\\begin{description}.+?\\item\[\] wakawaka.+?What/s, ++ qr/\\begin\{description\}.+?\\item\[\] wakawaka.+?What/s, + 'definition lists need description formatting to start' ); + +-like( $text, qr/\\item\[\] ook ook\n\nWhat.+says\.\n\n\\end{description}/, ++like( $text, qr/\\item\[\] ook ook\n\nWhat.+says\.\n\n\\end\{description\}/, + '... and to end' ); + + TODO: + { + local $TODO = "Seems like an upstream bug here\n"; + +- like( $text, qr/\\begin{enumerate}.+\\item \[22\] First/, ++ like( $text, qr/\\begin\{enumerate\}.+\\item \[22\] First/, + 'enumerated lists need their numbers intact' ); + +- like( $text, qr/\\item \[77\].+Fooled you!.+\\end{itemize}/, ++ like( $text, qr/\\item \[77\].+Fooled you!.+\\end\{itemize\}/, + '... and their itemized endings okay' ); + } +--- t/emit_environments.t 2011-07-11 00:20:52.000000000 +0200 ++++ t/emit_environments.t 2016-02-12 15:52:04.474748371 +0100 +@@ -18,10 +18,10 @@ + $fh->setpos(0); + my $text = join( '', <$fh> ); + +-like( $text, qr/\\vspace{3pt}\s*Hello, this is a sidebar/, ++like( $text, qr/\\vspace\{3pt\}\s*Hello, this is a sidebar/, + 'Emit formatting code when emit_environment option not set' ); + +-unlike( $text, qr/\\(?:begin|end){A?sidebar}/, ++unlike( $text, qr/\\(?:begin|end)\{A?sidebar\}/, + 'No sidebar environemnt whatsoever when emit_environment option not set' ); + + $fh = IO::String->new(); +@@ -33,5 +33,5 @@ + $fh->setpos(0); + $text = join( '', <$fh> ); + +-like( $text, qr/\\begin{Asidebar}\s*Hello, this is a sidebar\s*\\end{Asidebar}/, ++like( $text, qr/\\begin\{Asidebar\}\s*Hello, this is a sidebar\s*\\end\{Asidebar\}/, + 'Emit abstract \begin{foo} when emit_environment option is set' ); +--- t/environments.t 2011-07-11 00:20:52.000000000 +0200 ++++ t/environments.t 2016-02-12 15:58:21.942027640 +0100 +@@ -24,4 +24,4 @@ + like( $text, qr/\\LaTeX/, + '\LaTeX in a =for latex section remains intact' ); + +-like( $text, qr/\\begin{foo}{Title}/, "title is passed is available" ); ++like( $text, qr/\\begin\{foo\}\{Title\}/, "title is passed is available" ); +--- t/escapes.t 2011-07-11 00:20:52.000000000 +0200 ++++ t/escapes.t 2016-02-12 16:06:57.910862833 +0100 +@@ -29,7 +29,7 @@ + like( $text, qr/\\&/, '& should get quoted' ); + like( $text, qr/\\%/, '% should get quoted' ); + like( $text, qr/ \\_\./, '_ should get quoted' ); +-like( $text, qr/\\{\\},/, '{ and } should get quoted' ); ++like( $text, qr/\\\{\\\},/, '{ and } should get quoted' ); + like( $text, qr/ \$\\sim\$/, '~ should get quoted' ); + like( $text, qr/caret \\char94\{\}/, '^ should get quoted' ); + +@@ -45,28 +45,28 @@ + + like( $text, qr/ellipsis\\ldots and/, 'ellipsis needs a translation' ); + +-like( $text, qr/f\\mbox{}lame/, 'fl ligature needs marking' ); ++like( $text, qr/f\\mbox\{\}lame/, 'fl ligature needs marking' ); + +-like( $text, qr/f\\mbox{}ilk/, 'fi ligature also needs marking' ); ++like( $text, qr/f\\mbox\{\}ilk/, 'fi ligature also needs marking' ); + +-like( $text, qr/inef\\mbox{}fable/, 'ff ligature also needs marking too' ); ++like( $text, qr/inef\\mbox\{\}fable/, 'ff ligature also needs marking too' ); + + like( $text, qr/ligatures---and/, + 'spacey double dash should become a real emdash' ); + +-like( $text, qr/\\index{negation "! operator}/, ++like( $text, qr/\\index\{negation "! operator\}/, + '! must me quoted with " in an index entry' ); + +-like( $text, qr/\\index{array "@ sigil}/, ++like( $text, qr/\\index\{array "@ sigil\}/, + '@ must me quoted with " in an index entry' ); + +-like( $text, qr/\\index{the pipe "|}/, ++like( $text, qr/\\index\{the pipe "|\}/, + '| must me quoted with " in an index entry' ); + +-like( $text, qr/\\index{strange quote a""a}/, ++like( $text, qr/\\index\{strange quote a""a\}/, + 'non-escaped " must me quoted with another " in an index entry' ); + +-like( $text, qr/\\index{hierarchical terms!omiting trailing spaces}/, ++like( $text, qr/\\index\{hierarchical terms!omiting trailing spaces\}/, + 'trailing spaces in hierarchical terms should be ignored' ); + + like( $text, qr/\\\$BANG BANG\\\$/, +--- t/translations.t 2011-07-11 00:20:52.000000000 +0200 ++++ t/translations.t.new 2016-02-13 02:35:52.537094954 +0100 +@@ -39,26 +39,26 @@ + + like( $text, qr/\\pm some constant/, 'plusmn should get an escape too' ); + +-like( $text, qr/\\textbf{very} important/, ++like( $text, qr/\\textbf\{very\} important/, + 'bold text needs a formatting directive' ); + +-like( $text, qr/\\texttt{code-like text}/, ++like( $text, qr/\\texttt\{code-like text\}/, + 'code-marked text needs a formatting directive' ); + +-like( $text, qr/special \\emph{emphasis}/, ++like( $text, qr/special \\emph\{emphasis\}/, + 'file paths need an emphasis directive' ); + +-like( $text, qr/\\emph{semantic-only emphasis}/, ++like( $text, qr/\\emph\{semantic-only emphasis\}/, + '... and so does italicized text' ); + +-like( $text, qr/\\footnote{but beware of footnotes!}/, ++like( $text, qr/\\footnote\{but beware of footnotes!\}/, + 'footnotes need special escaping too' ); + +-like( $text, qr/\\index{Special formatting|textit}/, ++like( $text, qr/\\index\{Special formatting|textit\}/, + 'indexed items need even more special escaping' ); + + like( $text, qr/mc\$\^\{2\}\$/, 'superscript works' ); + + like( $text, qr/H\$\_\{2\}\$O/, 'subscript works' ); + +-like( $text, qr[\\url{http://www.google.com/}], 'urls work'); ++like( $text, qr[\\url\{http://www.google.com/\}], 'urls work'); diff --git a/perl-Pod-PseudoPod-LaTeX.spec b/perl-Pod-PseudoPod-LaTeX.spec index 2527fed..96d3b9b 100644 --- a/perl-Pod-PseudoPod-LaTeX.spec +++ b/perl-Pod-PseudoPod-LaTeX.spec @@ -1,6 +1,6 @@ Name: perl-Pod-PseudoPod-LaTeX -Version: 1.20160626 -Release: 1%{?dist} +Version: 1.20110710 +Release: 6%{?dist} Summary: Pod::PseudoPod::LaTeX Perl module License: GPL+ or Artistic Group: Development/Libraries @@ -8,29 +8,36 @@ URL: http://search.cpan.org/dist/Pod-PseudoPod-LaTeX/ Source0: http://www.cpan.org/modules/by-module/Pod/Pod-PseudoPod-LaTeX-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: coreutils -BuildRequires: findutils -BuildRequires: make -BuildRequires: perl BuildRequires: perl-generators -BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: perl(strict) -BuildRequires: perl(warnings) -# Run-time -BuildRequires: perl(base) -BuildRequires: perl(Pod::PseudoPod) >= 0.16 -# Tests -BuildRequires: perl(File::Spec::Functions) BuildRequires: perl(IO::String) +BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(Pod::PseudoPod) >= 0.15 BuildRequires: perl(Test::More) >= 0.60 +Requires: perl(Pod::PseudoPod) >= 0.15 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +# The patch changes 'Verbatim' to 'verbatim' in: +# lib/Pod/PseudoPod/LaTeX.pm +# t/sections.t +# +# In the test files the patch changes '{' to '\}' and '}' to '\}' +# to eliminate warnings. +# patching file t/sections.t +# patching file t/emit_environments.t +# patching file t/environments.t +# patching file t/escapes.t +# patching file t/translations.t +# +# The patch is sent to upstream via email +Patch0: Pod-PseudoPod-LaTeX-1.20110710.patch + %description This module is a Pod::PseudoPod subclass, itself a Pod::Simple subclass. This means that this is a full-fledged POD parser. %prep %setup -q -n Pod-PseudoPod-LaTeX-%{version} +%patch0 %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -41,7 +48,7 @@ rm -rf $RPM_BUILD_ROOT make pure_install DESTDIR=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -name .packlist -delete +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; %{_fixperms} $RPM_BUILD_ROOT%{_bindir}/ppod2latex @@ -53,17 +60,12 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%license LICENSE -%doc Changes README +%doc Changes dist.ini LICENSE README %{perl_vendorlib}/* -%{_mandir}/man1/ppod2latex.1* -%{_mandir}/man3/Pod::PseudoPod::LaTeX.3* +%{_mandir}/man3/Pod::PseudoPod::LaTeX.3pm.gz %{_bindir}/ppod2latex %changelog -* Fri Dec 09 2016 Jitka Plesnikova <jples...@redhat.com> - 1.20160626-1 -- 1.20160626 bump - * Sun May 15 2016 Jitka Plesnikova <jples...@redhat.com> - 1.20110710-6 - Perl 5.24 rebuild diff --git a/sources b/sources index 452a87d..c760f1d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2c32dc52f17031b3bd0c3379e92765cf Pod-PseudoPod-LaTeX-1.20160626.tar.gz +bef5c3d6a128cfd10b5e822facf34172 Pod-PseudoPod-LaTeX-1.20110710.tar.gz -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/perl-Pod-PseudoPod-LaTeX.git/commit/?h=master&id=222b9f9d0a8a733b414ba93b5324441034b44abf _______________________________________________ perl-devel mailing list -- perl-devel@lists.fedoraproject.org To unsubscribe send an email to perl-devel-le...@lists.fedoraproject.org