bootstrap off (conditionalize poppler changes)

texlive-base.spec

@@ -16,11 +16,11 @@
 %global __brp_mangle_shebangs_exclude ^$
 
 # We have a circular dep on latex due to xindy
-%bcond_without bootstrap
+%bcond_with bootstrap
 
 Name: %{shortname}-base
 Version: %{source_date}
-Release: 45%{?dist}
+Release: 46%{?dist}
 Epoch: 9
 Summary: TeX formatting system
 # The only files in the base package are directories, cache, and license texts
@@ -6738,7 +6738,10 @@ xz -dc %{SOURCE0} | tar x
 %patch31 -p1 -b .poppler-xpdf-fix
 %patch32 -p1 -b .archfix
 %patch33 -p1 -b .no-setpdfwrite
+
+%if 0%{?fedora} >= 36
 %patch34 -p1 -b .poppler22
+%endif
 
 # Setup copies of the licenses
 for l in `unxz -c %{SOURCE3} | tar t`; do
@@ -6792,7 +6795,12 @@ rm -f dummy.*
 %endif
 
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Werror=format-security"
+%if 0%{?fedora} >= 36
 export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Werror=format-security"
+%else
+export CXXFLAGS="$RPM_OPT_FLAGS -std=c++11 -fno-strict-aliasing -Werror=format-security"
+%endif
+
 cd source
 PREF=`pwd`/inst
 mkdir -p work
@@ -9396,6 +9404,9 @@ yes | %{_bindir}/updmap-sys --quiet --syncwithtrees >/dev/null 2>&1 || :
 %doc %{_texdir}/texmf-dist/doc/latex/yplan/
 
 %changelog
+* Sat Jan 15 2022 Tom Callaway <spot@fedoraproject.org> - 9:20210325-46
+- bootstrap off (conditionalize poppler changes)
+
 * Thu Jan 13 2022 Tom Callaway <spot@fedoraproject.org> - 9:20210325-45
 - rebuild for new poppler, bootstrap on