actually fix newline issue in pgf

etex-addlanguage-fix-bz1215257.patch

@@ -0,0 +1,25 @@
+--- etex.src.orig	2015-09-16 14:17:48.263123165 -0400
++++ etex.src	2015-09-16 14:14:20.673610421 -0400
+@@ -290,8 +290,10 @@
+ 
+ \def \addlanguage #1#2#3#4#5% language patterns exceptions lhm rhm
+     {\expandafter \et@xlang \csname lang@#1\endcsname
+-     \expandafter \chardef \csname lhm@#1\endcsname=#4 % V1.0-1
+-     \expandafter \chardef \csname rhm@#1\endcsname=#5 % V1.0-1
++     \def\paramD{#4}\ifx\paramD\empty\def\paramD{1}\fi % Default value lhm is 1 % V2.1-1
++     \def\paramE{#5}\ifx\paramD\empty\def\paramE{1}\fi % Default value rhm is 1 % V2.1-1
++     \expandafter \chardef \csname lhm@#1\endcsname=\paramD % V2.1-1
++     \expandafter \chardef \csname rhm@#1\endcsname=\paramE % V2.1-1
+      \uselanguage {#1}%
+      \input #2
+      \if *#3*\else \input #3 \fi
+@@ -776,6 +778,9 @@
+ 
+ %% Revision-history:
+ 
++24-ARP-2015: 2.1;1  Allow empty values on \addlanguages for parameters 4 and 5
++                         Changed by Edgar Hoch
++
+ 01-FEB-1999: 2.1;0  Allow file to be used with e-TeX versions 2.0 and 2.1
+ 
+ 25-MAR-1998: 2.0;19 Improved log message for \{glob|loc}{marks|box}vector (PEB)

macros.texlive

@@ -0,0 +1,26 @@
+# macros to keep trees in texlive consistent
+%_texmf          /usr/share/texlive/texmf-local
+%_texmf_main     /usr/share/texlive/texmf-dist
+%_texmf_vendor   /usr/share/texlive/texmf-dist
+%_texmf_var      /var/lib/texmf
+%_texmf_conf     /usr/share/texlive/texmf-config
+
+%texlive_post \
+mkdir -p /var/run/texlive \
+touch /var/run/texlive/run-texhash \
+touch /var/run/texlive/run-mtxrun \
+:
+
+%texlive_postun \
+if [ $1 == 1 ]; then \
+  mkdir -p /var/run/texlive \
+  touch /var/run/run-texhash \
+else \
+  %{_bindir}/texhash 2> /dev/null \
+fi \
+:
+
+%texlive_posttrans \
+if [ -e /var/run/texlive/run-texhash ] && [ -e %{_bindir}/texhash ]; then %{_bindir}/texhash 2> /dev/null; rm -f /var/run/texlive/run-texhash; fi \
+if [ -e /var/run/texlive/run-mtxrun ]; then export TEXMF=/usr/share/texlive/texmf-dist; export TEXMFCNF=/usr/share/texlive/texmf-dist/web2c; export TEXMFCACHE=/var/lib/texmf; %{_bindir}/mtxrun --generate &> /dev/null; rm -f /var/run/texlive/run-mtxrun; fi \
+:

texlive.spec

@@ -1,6 +1,6 @@
 %global source_date 20140525_r34255
 %global tl_version 2014
-%global tl_rel 8
+%global tl_rel 12
 %global tl_release %{tl_rel}.%{source_date}%{?dist}
 %global tl_noarch_release %{tl_rel}%{?dist}
 %global source_name texlive-%{source_date}-source
@@ -54,6 +54,7 @@ Conflicts: texlive-dvips = 2007
 Patch1: tl-kpfix.patch
 Patch2: tl-format.patch
 Patch100: texlive-bz979176.patch
+Patch101: etex-addlanguage-fix-bz1215257.patch
 Source0: %{source_name}.tar.xz
 Source1: tl2rpm.c
 Source2: texlive.tlpdb
@@ -64,6 +65,7 @@ Source6: texlive.spec.template
 Source7: co_source
 Source8: co_archive
 Source9: b_one_srpm
+Source10: macros.texlive
 Source0100: ftp://ftp.ctex.org/mirrors/CTAN/systems/texlive/tlnet/archive/aastex.tar.xz
 Source0101: ftp://ftp.ctex.org/mirrors/CTAN/systems/texlive/tlnet/archive/aastex.doc.tar.xz
 Source0102: ftp://ftp.ctex.org/mirrors/CTAN/systems/texlive/tlnet/archive/aastex.source.tar.xz
@@ -11839,6 +11841,7 @@ Version: svn30088.0
 Requires: texlive-kpathsea
 Release: %{tl_release}
 Requires: texlive-kpathsea-lib%{?_isa} = %{epoch}:%{tl_version}
+Requires: texlive-metafont-bin%{?_isa}
 
 %description kpathsea-bin
 Binaries for kpathsea
@@ -26724,6 +26727,8 @@ Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires(post,postun): coreutils
 Requires: texlive-bibexport-bin
+Provides: bibexport = %{tl_version}
+Obsoletes: bibexport < %{tl_version}
 
 %description bibexport
 A Bourne shell script that uses BibTeX to extract bibliography
@@ -26889,6 +26894,7 @@ Release: %{tl_noarch_release}
 BuildArch: noarch
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
+Requires: biber
 Requires(post,postun): coreutils
 Requires: tex(standard.bbx)
 Provides: tex(apa.bbx) = %{tl_version}
@@ -39378,6 +39384,8 @@ Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
 Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-base, texlive-texlive.infra
 Requires(post,postun): coreutils
+Provides: texlive-tlwg = %{epoch}:%{tl_version}
+Obsoletes: texlive-tlwg < %{epoch}:%{tl_version}
 Provides: tex(lthtlwg.enc) = %{tl_version}
 Provides: tex(nectec.map) = %{tl_version}
 Provides: tex(nf.map) = %{tl_version}
@@ -50176,6 +50184,7 @@ Summary: Binaries for latex-bin
 Version: svn14050.0
 Requires: texlive-base
 Requires: texlive-latex-bin
+Requires: texlive-texconfig-bin
 Release: %{tl_release}
 BuildArch: noarch
 
@@ -50467,6 +50476,8 @@ Requires: tex(parcolumns.sty)
 Requires: tex(lscape.sty)
 Requires: tex(index.sty)
 Requires: tex(zref-pagelayout.sty)
+# To complete the bundle
+Requires: tex(ifluatex.sty)
 Provides: tex(alphalph.sty) = %{tl_version}
 Provides: tex(atbegshi.sty) = %{tl_version}
 Provides: tex(bigintcalc.sty) = %{tl_version}
@@ -50482,7 +50493,8 @@ Provides: tex(hobsub-generic.sty) = %{tl_version}
 Provides: tex(hobsub.sty) = %{tl_version}
 Provides: tex(infwarerr.sty) = %{tl_version}
 Provides: tex(ltxcmds.sty) = %{tl_version}
-Provides: tex(ifluatex.sty) = %{tl_version}
+# This is wrong!
+# Provides: tex(ifluatex.sty) = %%{tl_version}
 Provides: tex(ifvtex.sty) = %{tl_version}
 Provides: tex(intcalc.sty) = %{tl_version}
 Provides: tex(ifpdf.sty) = %{tl_version}
@@ -55793,7 +55805,8 @@ Summary: Binaries for pdfcrop
 Version: svn14387.0
 Requires: texlive-base
 Requires: texlive-pdfcrop
-Requires: ghostscript-devel
+# invalid
+# Requires: ghostscript-devel
 Release: %{tl_release}
 BuildArch: noarch
 
@@ -57607,6 +57620,7 @@ Requires(post,postun): texlive-tetex-bin, tex-tetex, tex-hyphen-base, texlive-ba
 Requires(post,postun): coreutils
 Requires: tex-xetexconfig
 Requires: texlive-xetex-bin
+Requires: tex(xetex.def)
 Provides: tex(qx-unicode.map) = %{tl_version}
 Provides: tex(tex-text.map) = %{tl_version}
 
@@ -124414,7 +124428,7 @@ Requires: tex-hyph-utf8
 
 %description hyphen-indic
 Hyphenation patterns for Assamese, Bengali, Gujarati, Hindi,
-Kannada, Malayalam, Marathi, Oriya, Panjabi, Tamil and Telugu
+Kannada, Malayalam, Marathi, Odia, Panjabi, Tamil and Telugu
 for Unicode engines.
 
 %post hyphen-indic
@@ -124453,6 +124467,10 @@ sed -i '/oriya.*/d' %{_texdir}/texmf-dist/tex/generic/config/language.dat
 echo "oriya loadhyph-or.tex" >> %{_texdir}/texmf-dist/tex/generic/config/language.dat
 sed -i '/\\addlanguage{oriya}.*/d' %{_texdir}/texmf-dist/tex/generic/config/language.def
 echo "\addlanguage{oriya}{loadhyph-or.tex}{}{1}{1}" >> %{_texdir}/texmf-dist/tex/generic/config/language.def
+sed -i '/odia.*/d' %{_texdir}/texmf-dist/tex/generic/config/language.dat
+echo "odia loadhyph-or.tex" >> %{_texdir}/texmf-dist/tex/generic/config/language.dat
+sed -i '/\\addlanguage{odia}.*/d' %{_texdir}/texmf-dist/tex/generic/config/language.def
+echo "\addlanguage{odia}{loadhyph-or.tex}{}{1}{1}" >> %{_texdir}/texmf-dist/tex/generic/config/language.def
 sed -i '/panjabi.*/d' %{_texdir}/texmf-dist/tex/generic/config/language.dat
 echo "panjabi loadhyph-pa.tex" >> %{_texdir}/texmf-dist/tex/generic/config/language.dat
 sed -i '/\\addlanguage{panjabi}.*/d' %{_texdir}/texmf-dist/tex/generic/config/language.def
@@ -124487,6 +124505,8 @@ sed -i '/marathi.*/d' %{_texdir}/texmf-dist/tex/generic/config/language.dat > /d
 sed -i '/\\addlanguage{marathi}.*/d' %{_texdir}/texmf-dist/tex/generic/config/language.def > /dev/null 2>&1
 sed -i '/oriya.*/d' %{_texdir}/texmf-dist/tex/generic/config/language.dat > /dev/null 2>&1
 sed -i '/\\addlanguage{oriya}.*/d' %{_texdir}/texmf-dist/tex/generic/config/language.def > /dev/null 2>&1
+sed -i '/odia.*/d' %{_texdir}/texmf-dist/tex/generic/config/language.dat > /dev/null 2>&1
+sed -i '/\\addlanguage{odia}.*/d' %{_texdir}/texmf-dist/tex/generic/config/language.def > /dev/null 2>&1
 sed -i '/panjabi.*/d' %{_texdir}/texmf-dist/tex/generic/config/language.dat > /dev/null 2>&1
 sed -i '/\\addlanguage{panjabi}.*/d' %{_texdir}/texmf-dist/tex/generic/config/language.def > /dev/null 2>&1
 sed -i '/tamil.*/d' %{_texdir}/texmf-dist/tex/generic/config/language.dat > /dev/null 2>&1
@@ -170668,6 +170688,7 @@ Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires(post,postun): coreutils
 Requires: tex(xkeyval.sty)
+Requires: tex(titlesec.sty)
 Provides: tex(savetrees.sty) = %{tl_version}
 
 %description savetrees
@@ -177334,6 +177355,9 @@ Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires(post,postun): coreutils
 Provides: tex(textgreek.sty) = %{tl_version}
+# There are probably specific .sty files we could use here...
+Requires: texlive-greek-fontenc
+Requires: texlive-cbfonts-fd
 
 %description textgreek
 Use upright greek letters as text symbols, e.g. \textbeta.
@@ -178051,6 +178075,7 @@ BuildArch: noarch
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires(post,postun): coreutils
+Requires: tex(ifnextok.sty)
 Provides: tex(titlecaps.sty) = %{tl_version}
 
 %description titlecaps
@@ -182920,6 +182945,7 @@ Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires(post,postun): coreutils
 Requires: tex(catoptions.sty)
+Requires: tex(ltxkeys.sty)
 Provides: tex(xwatermark.sty) = %{tl_version}
 
 %description xwatermark
@@ -208279,6 +208305,13 @@ xz -dc %{SOURCE1107} | tar x -C %{buildroot}%{_texdir}/texmf-dist
 xz -dc %{SOURCE1108} | tar x -C %{buildroot}%{_texdir}/texmf-dist
 xz -dc %{SOURCE1109} | tar x -C %{buildroot}%{_texdir}/texmf-dist
 xz -dc %{SOURCE1110} | tar x -C %{buildroot}%{_texdir}/texmf-dist
+
+# patch etex
+pushd %{buildroot}%{_texdir}/texmf-dist/tex/plain/etex/
+patch -p0 < %{_sourcedir}/etex-addlanguage-fix-bz1215257.patch
+# %patch101 -p0
+popd
+
 xz -dc %{SOURCE1111} | tar x -C %{buildroot}%{_texdir}/texmf-dist
 xz -dc %{SOURCE1112} | tar x -C %{buildroot}%{_texdir}/texmf-dist
 xz -dc %{SOURCE1113} | tar x -C %{buildroot}%{_texdir}
@@ -212516,6 +212549,10 @@ rm -rf %{buildroot}%{_texdir}/texmf-dist/doc/man/Makefile
 rm -rf %{buildroot}%{_texdir}/texmf-dist/doc/man/man*/Makefile
 rm -rf %{buildroot}%{_texdir}/texmf-dist/doc/info/dir
 
+# Apply necessary cleanups
+# bz1241458
+sed -i 's|newline{\\Hnewline}|newline{^^J}|g' %{buildroot}%{_texdir}/texmf-dist/tex/generic/pgf/systemlayer/pgfsys-tex4ht.def
+
 mkdir -p %{buildroot}%{_bindir}
 mv %{buildroot}/bin/i386-linux/* %{buildroot}%{_bindir}
 for i in `find %{buildroot}%{_bindir} -type f`; do
@@ -212610,6 +212647,8 @@ rm -f mkjobtexmf
 ln -s /usr/share/texlive/texmf-dist/scripts/mkjobtexmf/mkjobtexmf.pl mkjobtexmf
 rm -f rungs
 ln -s /usr/share/texlive/texmf-dist/scripts/texlive/rungs.tlu rungs
+rm -f bibexport.sh
+ln -s /usr/share/texlive/texmf-dist/scripts/bibexport.sh bibexport.sh
 rm -f context
 cat > context << EOF
 #!/bin/sh
@@ -212889,13 +212928,7 @@ sed -i -e 's|^TEXMFLOCAL.*|TEXMFLOCAL = $TEXMFROOT/texmf-local//|' %{buildroot}/
 
 # create macro file for building texlive
 mkdir -p %{buildroot}%{macrosdir}
-cat << EOF > %{buildroot}%{macrosdir}/macros.texlive
-# macros to keep trees in texlive consistent
-%_texmf_main     /usr/share/texlive/texmf
-%_texmf_vendor   /usr/share/texlive/texmf
-%_texmf_var      /var/lib/texmf
-%_texmf_conf     /usr/share/texlive/texmf-config
-EOF
+cp -a %{SOURCE10} %{buildroot}%{macrosdir}/macros.texlive
 
 %clean
 rm -rf %{buildroot}
@@ -235491,6 +235524,7 @@ fi
 %files bibexport
 %defattr(-,root,root)
 %doc lppl1.3.txt
+%{_bindir}/bibexport.sh
 %{_texdir}/texmf-dist/bibtex/bst/bibexport/expcites.bst
 %{_texdir}/texmf-dist/bibtex/bst/bibexport/expkeys.bst
 %{_texdir}/texmf-dist/bibtex/bst/bibexport/export.bst
@@ -355409,6 +355443,34 @@ fi
 %{_libdir}/*.so
 
 %changelog
+* Mon Nov 30 2015 Tom Callaway <spot@fedoraproject.org> - 4:2014-12.20140525_r34255
+- actually fix newline issue in pgf
+
+* Thu Oct  1 2015 Tom Callaway <spot@fedoraproject.org> - 4:2014-11.20140525_r34255
+- fix rpm macros so that the right file is copied
+- add Requires: tex(titlesec.sty) to savetrees (bz1266801)
+
+* Mon Sep 21 2015 Tom Callaway <spot@fedoraproject.org> - 4:2014-10.20140525_r34255
+- add Requires: tex(ltxkeys.sty) to xwatermark (bz1197494)
+- add Requires: tex(ifnextok.sty) to titlecaps (bz1186688)
+- add Requires: tex(xetex.def) to xetex (bz1155267)
+- add Requires: texlive-texconfig-bin to latex-bin-bin (bz995752)
+- add Provides/Obsoletes bibexport to texlive-bibexport
+  add bibexport.sh symlink in /usr/bin (bz979448)
+
+* Wed Sep 16 2015 Tom Callaway <spot@fedoraproject.org> - 4:2014-9.20140525_r34255
+- fix newline issue in pgf (bz1241458)
+- do not require: ghostscript-devel for texlive-pdfcrop-bin (bz1229407)
+- do not provide: tex(ifluatex.sty) in texlive-oberdiek (bz1146684)
+  ... but do require: tex(ifluatex.sty) in texlive-oberdiek to ensure complete bundle
+- add Requires: texlive-metafont-bin to texlive-kpathsea-bin (bz1123096)
+- add Provides/Obsoletes texlive-tlwg to texlive-fonts-tlwg (bz1100984)
+- add Requires: texlive-greek-fontenc and Requires: texlive-cbfonts-fd to texlive-greek-fontenc (bz1064051)
+- apply patch from Edgar Hoch to fix etex.src to permit \addlanguage to have empty params 4 & 5 (bz1215257)
+- replace visible references to oriya to odia, add odia as equiv lang to oriya (bz1040337)
+- use macros.texlive file as source10, add and cleanup macros (bz1054317)
+- add Requires: biber to texlive-biblatex-apa (bz1048193)
+
 * Wed Apr 29 2015 Than Ngo <than@redhat.com> - 4:2014-8.20140525_r34255
 - Resolves: bz#1181169, insecure use of /tmp in mktexlsr