diff --git a/texlive.spec b/texlive.spec
index c0e6cbb..1f2fad9 100644
--- a/texlive.spec
+++ b/texlive.spec
@@ -180001,16 +180001,16 @@ BuildArch: noarch
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 # texlive-dvipdfmx-def has this.
-# Provides: tex(dvipdfmx.def) = %{tl_version}
+# Provides: tex(dvipdfmx.def) = %%{tl_version}
 # texlive-graphics has this.
-# Provides: tex(dvips.def) = %{tl_version}
+# Provides: tex(dvips.def) = %%{tl_version}
 # texlive-dvisvgm-def has this.
-# Provides: tex(dvisvgm.def) = %{tl_version}
+# Provides: tex(dvisvgm.def) = %%{tl_version}
 Provides: tex(luatex.def) = %{tl_version}
 # texlive-pdftex-def has this.
-# Provides: tex(pdftex.def) = %{tl_version}
+# Provides: tex(pdftex.def) = %%{tl_version}
 # texlive-xetex-def has this.
-# Provides: tex(xetex.def) = %{tl_version}
+# Provides: tex(xetex.def) = %%{tl_version}
 
 %description graphics-def
 This bundle is a combined distribution consisting of dvips.def,
@@ -180726,8 +180726,8 @@ xz -dc %{SOURCE872} | tar x -C %{buildroot}%{_texdir}/texmf-dist
 xz -dc %{SOURCE873} | tar x -C %{buildroot}%{_texdir}/texmf-dist
 xz -dc %{SOURCE874} | tar x -C %{buildroot}%{_texdir}/texmf-dist
 xz -dc %{SOURCE875} | tar x -C %{buildroot}%{_texdir}/texmf-dist
-# xz -dc %{SOURCE876} | tar x -C %{buildroot}%{_texdir}/texmf-dist
-# xz -dc %{SOURCE877} | tar x -C %{buildroot}%{_texdir}/texmf-dist
+# xz -dc %%{SOURCE876} | tar x -C %%{buildroot}%%{_texdir}/texmf-dist
+# xz -dc %%{SOURCE877} | tar x -C %%{buildroot}%%{_texdir}/texmf-dist
 xz -dc %{SOURCE879} | tar x -C %{buildroot}%{_texdir}/texmf-dist
 xz -dc %{SOURCE880} | tar x -C %{buildroot}%{_texdir}/texmf-dist
 xz -dc %{SOURCE882} | tar x -C %{buildroot}%{_texdir}/texmf-dist
@@ -181131,7 +181131,7 @@ xz -dc %{SOURCE1348} | 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
+# %%patch101 -p0
 popd
 
 xz -dc %{SOURCE1349} | tar x -C %{buildroot}%{_texdir}
@@ -185768,7 +185768,7 @@ xz -dc %{SOURCE7260} | tar x -C %{buildroot}%{_texdir}/texmf-dist
 xz -dc %{SOURCE7261} | tar x -C %{buildroot}%{_texdir}/texmf-dist
 xz -dc %{SOURCE7262} | tar x -C %{buildroot}%{_texdir}/texmf-dist
 xz -dc %{SOURCE7263} | tar x -C %{buildroot}%{_texdir}/texmf-dist
-# xz -dc %{SOURCE7264} | tar x -C %{buildroot}%{_texdir}/texmf-dist
+# xz -dc %%{SOURCE7264} | tar x -C %%{buildroot}%%{_texdir}/texmf-dist
 xz -dc %{SOURCE7265} | tar x -C %{buildroot}%{_texdir}/texmf-dist
 xz -dc %{SOURCE7267} | tar x -C %{buildroot}%{_texdir}/texmf-dist
 xz -dc %{SOURCE7268} | tar x -C %{buildroot}%{_texdir}/texmf-dist
@@ -185997,8 +185997,8 @@ xz -dc %{SOURCE7543} | tar x -C %{buildroot}%{_texdir}/texmf-dist
 xz -dc %{SOURCE7544} | tar x -C %{buildroot}%{_texdir}
 xz -dc %{SOURCE7545} | tar x -C %{buildroot}%{_texdir}
 xz -dc %{SOURCE7547} | tar x -C %{buildroot}
-# xz -dc %{SOURCE7548} | tar x -C %{buildroot}%{_texdir}/texmf-dist
-# xz -dc %{SOURCE7549} | tar x -C %{buildroot}%{_texdir}/texmf-dist
+# xz -dc %%{SOURCE7548} | tar x -C %%{buildroot}%%{_texdir}/texmf-dist
+# xz -dc %%{SOURCE7549} | tar x -C %%{buildroot}%%{_texdir}/texmf-dist
 xz -dc %{SOURCE7550} | tar x -C %{buildroot}%{_texdir}/texmf-dist
 xz -dc %{SOURCE7551} | tar x -C %{buildroot}%{_texdir}/texmf-dist
 xz -dc %{SOURCE7552} | tar x -C %{buildroot}%{_texdir}/texmf-dist
@@ -186038,7 +186038,7 @@ xz -dc %{SOURCE7588} | tar x -C %{buildroot}%{_texdir}/texmf-dist
 xz -dc %{SOURCE7589} | tar x -C %{buildroot}%{_texdir}/texmf-dist
 xz -dc %{SOURCE7591} | tar x -C %{buildroot}%{_texdir}/texmf-dist
 xz -dc %{SOURCE7592} | tar x -C %{buildroot}%{_texdir}/texmf-dist
-# xz -dc %{SOURCE7593} | tar x -C %{buildroot}%{_texdir}/texmf-dist
+# xz -dc %%{SOURCE7593} | tar x -C %%{buildroot}%%{_texdir}/texmf-dist
 xz -dc %{SOURCE7594} | tar x -C %{buildroot}%{_texdir}
 xz -dc %{SOURCE7595} | tar x -C %{buildroot}
 xz -dc %{SOURCE7596} | tar x -C %{buildroot}%{_texdir}/texmf-dist
@@ -186076,13 +186076,13 @@ sed -i 's|\\sc |\\scshape |g' %{buildroot}%{_texdir}/texmf-dist/bibtex/bst/base/
 # patch latexpand
 pushd %{buildroot}%{_texdir}/texmf-dist/scripts/latexpand
 patch -p0 < %{_sourcedir}/texlive-latexpand-perl518.patch
-# %patch102 -p0
+# %%patch102 -p0
 popd
 
 #patch latexdiff.pl
 pushd %{buildroot}%{_texdir}/texmf-dist/scripts/latexdiff
 patch -p0 < %{_sourcedir}/texlive-2016-latexdiff-perl518.patch
-# %patch103 -p0
+# %%patch103 -p0
 popd
 
 #patch sympytexpackage to set correct python path
@@ -186348,7 +186348,7 @@ touch %{buildroot}%{_texdir}/texmf-dist/ls-R
 
 # configure ConTeXt
 #for i in ctxtools luatools texexec texmfstart; do
-#  sed -i -e 's|mtxrun|export TEXMF=/usr/share/texlive/texmf-dist; export TEXMFCNF=/usr/share/texlive/texmf-dist/web2c; export TEXMFCACHE=/var/lib/texmf; mtxrun|' %{buildroot}%{_bindir}/$i
+#  sed -i -e 's|mtxrun|export TEXMF=/usr/share/texlive/texmf-dist; export TEXMFCNF=/usr/share/texlive/texmf-dist/web2c; export TEXMFCACHE=/var/lib/texmf; mtxrun|' %%{buildroot}%%{_bindir}/$i
 #done
 
 # configure texmf-local - make it visible to kpathsea
@@ -186505,12 +186505,12 @@ fi
 %dir %{_texdir}/texmf-dist/doc/fonts/allrunes
 %dir %{_texdir}/texmf-dist/doc/fonts/almfixed
 %dir %{_texdir}/texmf-dist/doc/fonts/amiri
-# %dir %{_texdir}/texmf-dist/doc/fonts/amiri/documentation
-# %dir %{_texdir}/texmf-dist/doc/fonts/amiri/documentation/documentation-sources
-# %dir %{_texdir}/texmf-dist/doc/fonts/amiri/sources
-# %dir %{_texdir}/texmf-dist/doc/fonts/amiri/sources/crimson
-# %dir %{_texdir}/texmf-dist/doc/fonts/amiri/test-suite
-# %dir %{_texdir}/texmf-dist/doc/fonts/amiri/tools
+# %%dir %%{_texdir}/texmf-dist/doc/fonts/amiri/documentation
+# %%dir %%{_texdir}/texmf-dist/doc/fonts/amiri/documentation/documentation-sources
+# %%dir %%{_texdir}/texmf-dist/doc/fonts/amiri/sources
+# %%dir %%{_texdir}/texmf-dist/doc/fonts/amiri/sources/crimson
+# %%dir %%{_texdir}/texmf-dist/doc/fonts/amiri/test-suite
+# %%dir %%{_texdir}/texmf-dist/doc/fonts/amiri/tools
 %dir %{_texdir}/texmf-dist/doc/fonts/amsfonts
 %dir %{_texdir}/texmf-dist/doc/fonts/anonymouspro
 %dir %{_texdir}/texmf-dist/doc/fonts/antiqua
@@ -186982,7 +186982,7 @@ fi
 %dir %{_texdir}/texmf-dist/doc/generic/minifp
 %dir %{_texdir}/texmf-dist/doc/generic/mkjobtexmf
 %dir %{_texdir}/texmf-dist/doc/generic/m-tx
-# %dir %{_texdir}/texmf-dist/doc/generic/m-tx/mtx060
+# %%dir %%{_texdir}/texmf-dist/doc/generic/m-tx/mtx060
 %dir %{_texdir}/texmf-dist/doc/generic/multido
 %dir %{_texdir}/texmf-dist/doc/generic/musixtex
 %dir %{_texdir}/texmf-dist/doc/generic/musixtex/examples
@@ -186999,7 +186999,7 @@ fi
 %dir %{_texdir}/texmf-dist/doc/generic/ofs
 %dir %{_texdir}/texmf-dist/doc/generic/path
 %dir %{_texdir}/texmf-dist/doc/generic/pdf-trans
-# %dir %{_texdir}/texmf-dist/doc/generic/petri-nets
+# %%dir %%{_texdir}/texmf-dist/doc/generic/petri-nets
 %dir %{_texdir}/texmf-dist/doc/generic/pgf
 %dir %{_texdir}/texmf-dist/doc/generic/pgf/images
 %dir %{_texdir}/texmf-dist/doc/generic/pgf/licenses
@@ -190272,7 +190272,7 @@ fi
 %dir %{_texdir}/texmf-dist/tex/latex/blochsphere
 %dir %{_texdir}/texmf-dist/tex/latex/block
 %dir %{_texdir}/texmf-dist/tex/latex/bloques
-# %dir %{_texdir}/texmf-dist/tex/latex/blowup
+# %%dir %%{_texdir}/texmf-dist/tex/latex/blowup
 %dir %{_texdir}/texmf-dist/tex/latex/blox
 %dir %{_texdir}/texmf-dist/tex/latex/bnumexpr
 %dir %{_texdir}/texmf-dist/tex/latex/bodegraph