From 2770f584dfb9bf41cd2a05bfcd72ce0fa34135ef Mon Sep 17 00:00:00 2001
From: Marek Kasik <mkasik@redhat.com>
Date: Fri, 17 Jan 2020 22:16:31 +0100
Subject: [PATCH] Bring back xindy and the circular dependency

on texlive-latex
---
 texlive-base.spec | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/texlive-base.spec b/texlive-base.spec
index ba73717..1f4c617 100644
--- a/texlive-base.spec
+++ b/texlive-base.spec
@@ -17,7 +17,7 @@
 
 Name: %{shortname}-base
 Version: %{source_date}
-Release: 8%{?dist}
+Release: 9%{?dist}
 Epoch: 7
 Summary: TeX formatting system
 # The only files in the base package are directories, cache, and license texts
@@ -452,10 +452,8 @@ BuildRequires: gmp-devel mpfr-devel
 # This is really for macros.
 BuildRequires: python3-devel
 # This is for xindy
-%if 0
 BuildRequires: clisp-devel
 BuildRequires: texlive-cyrillic, texlive-latex, texlive-metafont, texlive-cm-super, texlive-ec
-%endif
 # Cleanup Provides/Obsoletes
 # texlive-cjk-gs-integrate (depackaged 2018-03-09)
 Provides: texlive-cjk-gs-integrate = %{epoch}:%{source_date}-%{release}
@@ -6446,7 +6444,6 @@ BuildArch: noarch
 %description -n %{shortname}-xindex
 Unicode compatible index program for LaTeX.
 
-%if 0
 %package -n %{shortname}-xindy
 Provides: tex-xindy = %{epoch}:%{source_date}-%{release}
 Provides: tex-xindy-bin = %{epoch}:%{source_date}-%{release}
@@ -6471,7 +6468,6 @@ Xindy can be used to process indexes for documents marked up
 using (La)TeX, Nroff family and SGML-based languages. Xindy is
 highly configurable, both in markup terms and in terms of the
 collating order of the text being processed.
-%endif
 
 %package -n %{shortname}-xmltex
 Provides: tex-xmltex = %{epoch}:%{source_date}-%{release}
@@ -6566,7 +6562,6 @@ done
 %global mysources %{lua: for index,value in ipairs(sources) do if index >= 16 then print(value.." ") end end}
 
 %build
-%if 0
 # Make texlive generate latex.fmt, so that multiple threads do not race to
 # make it during the xindy build.
 cat > dummy.tex << EOF
@@ -6577,7 +6572,6 @@ This is a document.
 EOF
 latex dummy.tex
 rm -f dummy.*
-%endif
 
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Werror=format-security"
 export CXXFLAGS="$RPM_OPT_FLAGS -std=c++11 -fno-strict-aliasing -Werror=format-security"
@@ -6601,7 +6595,7 @@ cd work
 %ifarch aarch64 %{mips} %{power64} s390 s390x
 --disable-luajittex --disable-mfluajit \
 %endif
---disable-xindy --disable-xindy-docs --disable-xindy-make-rules \
+--enable-xindy --disable-xindy-docs --disable-xindy-make-rules \
 --disable-rpath
 
 # disable rpath
@@ -6871,13 +6865,6 @@ cp -R %{buildroot}%{_texdir}/texmf-dist/doc/man %{buildroot}%{_datadir}/
 find %{buildroot}%{_texdir}/texmf-dist/doc/man -type f | xargs rm -f
 mv %{buildroot}%{_texdir}/texmf-dist/doc/info/* %{buildroot}%{_infodir}/
 
-rm -rf %{buildroot}%{_mandir}/man1/xindy.1*
-rm -rf %{buildroot}%{_mandir}/man1/texindy.1*
-rm -rf %{buildroot}%{_mandir}/man1/tex2xindy.1*
-rm -rf %{buildroot}%{_texdir}/texmf-dist/scripts/xindy
-rm -rf %{buildroot}%{_texdir}/texmf-dist/xindy
-rm -rf %{buildroot}%{_texdir}/texmf-dist/doc/xindy
-
 # Remove cjk-gs-integrate files
 # Yes, we probably should remove the source, but there is a possibility that we will
 # re-add this subpackage at some point.
@@ -9019,7 +9006,6 @@ done <<< "$list"
 %{_texdir}/texmf-dist/tex/lualatex/xindex/
 %doc %{_texdir}/texmf-dist/doc/lualatex/xindex/
 
-%if 0
 %files -n %{shortname}-xindy
 %license gpl.txt
 %{_bindir}/tex2xindy
@@ -9032,7 +9018,6 @@ done <<< "$list"
 %{_texdir}/texmf-dist/scripts/xindy/
 %{_texdir}/texmf-dist/xindy/
 %doc %{_texdir}/texmf-dist/doc/xindy/
-%endif
 
 %files -n %{shortname}-xmltex
 %license lppl1.txt
@@ -9050,6 +9035,9 @@ done <<< "$list"
 %doc %{_texdir}/texmf-dist/doc/latex/yplan/
 
 %changelog
+* Fri Jan 17 2020 Marek Kasik <mkasik@redhat.com> - 7:20190410-9
+- Bring back xindy and the circular dependency on texlive-latex
+
 * Fri Jan 17 2020 Marek Kasik <mkasik@redhat.com> - 7:20190410-8
 - Rebuild for poppler-0.84.0
 - Don't include C++ headers in C sources