fix dependencies for pdfjam-bin (bz1164237), actually apply a2perl patch in a way that will stick into the package

This commit is contained in:
Tom Callaway 2018-03-15 15:56:24 -04:00
parent 6db0598982
commit 49220e62e8
2 changed files with 17 additions and 6 deletions

View File

@ -1,6 +1,5 @@
diff -up texlive-base-20170520/source/texk/texlive/linked_scripts/a2ping/a2ping.pl.gs922 texlive-base-20170520/source/texk/texlive/linked_scripts/a2ping/a2ping.pl
--- texlive-base-20170520/source/texk/texlive/linked_scripts/a2ping/a2ping.pl.gs922 2018-03-11 14:15:15.824669043 -0400
+++ texlive-base-20170520/source/texk/texlive/linked_scripts/a2ping/a2ping.pl 2018-03-11 14:15:21.803523499 -0400
--- a2ping.pl.gs922 2018-03-11 14:15:15.824669043 -0400
+++ a2ping.pl 2018-03-11 14:15:21.803523499 -0400
@@ -352,7 +352,7 @@ use just +1; # a JustLib application
use strict;
use integer;

View File

@ -1,6 +1,6 @@
%global source_date 20160520
%global tl_version 2016
%global tl_rel 37
%global tl_rel 38
%global tl_release %{tl_rel}.%{source_date}%{?dist}
%global tl_noarch_release %{tl_rel}%{?dist}
%global source_name texlive-%{source_date}-source
@ -49133,7 +49133,6 @@ Release: %{tl_noarch_release}.5
BuildArch: noarch
Requires: texlive-base
Requires: texlive-kpathsea-bin, tex-kpathsea
Requires: texlive-pdfjam-bin
Provides: pdfjam = %{tl_version}
Obsoletes: pdfjam < %{tl_version}
@ -49162,6 +49161,8 @@ Version: svn17868.0
Requires: texlive-base
Requires: texlive-pdfjam
Requires: tex(pdfpages.sty)
Requires: texlive-latex-bin-bin
Requires: texlive-collection-latex
Release: %{tl_release}.5
BuildArch: noarch
@ -180034,7 +180035,6 @@ cp %{SOURCE7597} .
%patch100 -p0
%patch104 -p1
%patch105 -p1
%patch107 -p1
for l in `unxz -c %{SOURCE3} | tar t`; do
ln -s %{_texdir}/licenses/$l $l
done
@ -180087,6 +180087,14 @@ xz -dc %{SOURCE104} | tar x -C %{buildroot}%{_texdir}/texmf-dist
xz -dc %{SOURCE105} | tar x -C %{buildroot}%{_texdir}/texmf-dist
xz -dc %{SOURCE106} | tar x -C %{buildroot}%{_texdir}/texmf-dist
xz -dc %{SOURCE107} | tar x -C %{buildroot}%{_texdir}
# need to patch a2ping.pl from tarball here. master source patching is overwritten.
pushd %{buildroot}%{_texdir}/texmf-dist/scripts/a2ping
patch -p0 < %{_sourcedir}/texlive-base-fix-a2ping-with-gs-9.22.patch
# %patch107 -p0
popd
xz -dc %{SOURCE108} | tar x -C %{buildroot}%{_texdir}
xz -dc %{SOURCE7000} | tar x -C %{buildroot}
xz -dc %{SOURCE109} | tar x -C %{buildroot}%{_texdir}/texmf-dist
@ -222048,6 +222056,10 @@ fi
%{_libdir}/pkgconfig/*.pc
%changelog
* Thu Mar 15 2018 Tom Callaway <spot@fedoraproject.org> - 6:2016-38.20160520
- fix dependencies for pdfjam-bin (bz1164237)
- actually apply a2perl patch in a way that will stick into the package.
* Sun Mar 11 2018 Tom Callaway <spot@fedoraproject.org> - 6:2016-37.20160520
- fix a2perl to work with ghostscript 9.22+