diff --git a/texlive-rpmlintrc b/texlive-rpmlintrc index 8a1fc40..10f269c 100644 --- a/texlive-rpmlintrc +++ b/texlive-rpmlintrc @@ -19,6 +19,7 @@ addFilter(".*rpm-buildroot-usage.*") addFilter(".*binary-or-shlib-calls-gethostbyname.*") addFilter(".*zero-length.*") addFilter(".*dangling-symlink.*/usr/lib/mktex/public.*") +addFilter(".*dangling-symlink.*/usr/libexec/mktex/public.*") addFilter(".*devel-dependency.*texlive-lua-visual-debug.*") addFilter(".*obsolete-not-provided.*") addFilter(".*position-independent-executable-suggested.*") diff --git a/texlive.changes b/texlive.changes index c2bec0c..41460cc 100644 --- a/texlive.changes +++ b/texlive.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 23 16:22:42 UTC 2021 - Callum Farmer + +- Fixes for %_libexecdir changing to /usr/libexec (bsc#1174075) + ------------------------------------------------------------------- Wed Aug 12 11:23:33 UTC 2020 - Dr. Werner Fink diff --git a/texlive.spec b/texlive.spec index 63e7bd3..c99d137 100644 --- a/texlive.spec +++ b/texlive.spec @@ -297,7 +297,9 @@ Obsoletes: pdfjam < %{version} %{expand: %%global options %(mktemp /tmp/texlive-opts.XXXXXXXX)} %global _varlib %{_localstatedir}/lib -%global _libexecdir %{_prefix}/lib + +%define libexec %(rpm --eval '%%{_libexecdir}' | sed 's-/usr--g') +%define libexecdir ${prefix}%{libexec} %define _texmfdistdir %{_datadir}/texmf %if 0%{texlive_version} >= 2013 @@ -4095,8 +4097,8 @@ fi popd # compile public - mkdir -p ${prefix}/lib/mktex - $CC ${RPM_OPT_FLAGS} -DTEXGRP='"%{texgrp}"' -DTEXUSR='"%{texusr}"' -DMKTEX='"%{_libexecdir}/mktex"' -fPIE -pie -o ${prefix}/lib/mktex/public %{S:50} + mkdir -p %{libexecdir}/mktex + $CC ${RPM_OPT_FLAGS} -DTEXGRP='"%{texgrp}"' -DTEXUSR='"%{texusr}"' -DMKTEX='"%{_libexecdir}/mktex"' -fPIE -pie -o %{libexecdir}/mktex/public %{S:50} # install our own scripts mkdir -p ${prefix}/bin @@ -4210,6 +4212,8 @@ fi popd pushd ${prefix}/lib/ tar -cpSf - *.so* | tar -xvspSf - -C %{buildroot}%{_libdir}/ + popd + pushd %{libexecdir}/ tar -cpSf - mktex | tar -xvspSf - -C %{buildroot}%{_libexecdir}/ popd pushd ${prefix}/share/texmf