From 815c8e483f0d5d92ef371c806f17634573aa3131 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Jun 19 2018 21:22:06 +0000 Subject: Remove install-info deps and scriptlets. The info dir node is handle by file triggers in F28+, so it is no longer necessary to call install-info. I also edited tl2rpm.c to remove the calls, but I don't think that is actually used these days. --- diff --git a/texlive.spec b/texlive.spec index 1aedc62..f07793a 100644 --- a/texlive.spec +++ b/texlive.spec @@ -83804,7 +83804,6 @@ Version: svn38345.0 Requires: texlive-base Requires: texlive-kpathsea-bin, tex-kpathsea -Requires(post,postun): /sbin/install-info Provides: tex(adobe.map) = %{tl_version} Provides: tex(apple.map) = %{tl_version} Provides: tex(bitstrea.map) = %{tl_version} @@ -83834,15 +83833,6 @@ The scheme for assigning names is described (in the documentation part of the package), and map files giving the relation between foundry name and 'TeX-name' are also provided. -%preun fontname -if [ "$1" == "0" ]; then - /sbin/install-info --delete %{_infodir}/fontname.info %{_infodir}/dir 2>/dev/null || : -fi - -%post fontname -/sbin/install-info %{_infodir}/fontname.info %{_infodir}/dir 2>/dev/null -: - %package fontname-doc Summary: Documentation for fontname Version: svn38345.0 @@ -93649,8 +93639,6 @@ Version: svn44985 Requires: texlive-base Requires: texlive-kpathsea-bin, tex-kpathsea -Requires(post,postun): /sbin/install-info - %description latex2e-help-texinfo The manual is provided as Texinfo source (which was originally derived from the VMS help file in the DECUS TeX distribution of @@ -93659,15 +93647,6 @@ development, and details of getting involved are to be found on the package home page. All the other formats in the distribution are derived from the Texinfo source, as usual. -%preun latex2e-help-texinfo -if [ "$1" == "0" ]; then - /sbin/install-info --delete %{_infodir}/latex2e.info %{_infodir}/dir 2>/dev/null || : -fi - -%post latex2e-help-texinfo -/sbin/install-info %{_infodir}/latex2e.info %{_infodir}/dir 2>/dev/null -: - %package latex2e-help-texinfo-doc Summary: Documentation for latex2e-help-texinfo Version: svn44985 @@ -104992,20 +104971,10 @@ Summary: latex2e-help-texinfo-spanish package Version: svn45037 Requires: texlive-base Requires: texlive-kpathsea-bin, tex-kpathsea -Requires(post,postun): /sbin/install-info %description latex2e-help-texinfo-spanish latex2e-help-texinfo-spanish package -%preun latex2e-help-texinfo-spanish -if [ "$1" == "0" ]; then - /sbin/install-info --delete %{_infodir}/latex2e-es.info %{_infodir}/dir 2>/dev/null || : -fi - -%post latex2e-help-texinfo-spanish -/sbin/install-info %{_infodir}/latex2e-es.info %{_infodir}/dir 2>/dev/null -: - %package latex2e-help-texinfo-spanish-doc Summary: Documentation for latex2e-help-texinfo-spanish Version: svn45037 @@ -110510,7 +110479,6 @@ Version: svn31894.0 Requires: texlive-base Requires: texlive-kpathsea-bin, tex-kpathsea -Requires(post,postun): /sbin/install-info Requires: tex(graphics.sty) Provides: tex(blockdiagram.tex) = %{tl_version} Provides: tex(texdraw.sty) = %{tl_version} @@ -110530,15 +110498,6 @@ scaling and line parameters. Using TeX's macro definition capability, new drawing commands can be constructed from drawing segments. -%preun texdraw -if [ "$1" == "0" ]; then - /sbin/install-info --delete %{_infodir}/texdraw.info %{_infodir}/dir 2>/dev/null || : -fi - -%post texdraw -/sbin/install-info %{_infodir}/texdraw.info %{_infodir}/dir 2>/dev/null -: - %package texdraw-doc Summary: Documentation for texdraw Version: svn31894.0 @@ -158536,15 +158495,6 @@ AutoReqProv: No %description latex2e-help-texinfo-fr-doc Documentation for latex2e-help-texinfo-fr -%preun latex2e-help-texinfo-fr-doc -if [ "$1" == "0" ]; then - /sbin/install-info --delete %{_infodir}/latex2e-fr.info %{_infodir}/dir 2>/dev/null || : -fi - -%post latex2e-help-texinfo-fr-doc -/sbin/install-info %{_infodir}/latex2e-fr.info %{_infodir}/dir 2>/dev/null -: - %package latex-bib2-ex-doc Provides: tex-latex-bib2-ex-doc = %{tl_version} License: LPPL diff --git a/tl2rpm.c b/tl2rpm.c index 3c778d2..048659f 100644 --- a/tl2rpm.c +++ b/tl2rpm.c @@ -1403,7 +1403,6 @@ void solve(char *name) { /* require coreutils if there is %post scriptlet present */ if ( pkg[i].exes || pkg[i].runfs ) fprintf(fpack, REQ_POST_POSTUN"coreutils\n"); // if ( pkg[i].runfs ) fprintf(fpack, REQ_POST_POSTUN"texlive-kpathsea-bin, tex-kpathsea\n"); - if ( pkg[i].has_info ) fprintf(fpack, REQ_POST_POSTUN"/sbin/install-info\n"); for (n=0; ncatalogue_license & LIC_NOTALLOWED ) { @@ -1585,21 +1584,6 @@ void solve(char *name) { if ( pkg[i].catalogue_date ) fprintf(fpack, "\ndate: %s\n", pkg[i].catalogue_date); fprintf(fpack, "\n"); /* preun/post/postun scriptlets */ - if ( pkg[i].has_info ) { - int k; -#ifndef SRPMS - fprintf(fpack, "%%preun %s\n", name); -#else - fprintf(fpack, "%%preun\n"); -#endif - fprintf(fpack, "if [ \"$1\" == \"0\" ]; then\n"); - for (k=0; k/dev/null || :\n", &pkg[i].runf[k][20]); - } - } - fprintf(fpack, "fi\n\n"); - } if ( pkg[i].exes ) { int run_updmap, run_fmtutil; #ifndef SRPMS