diff --git a/texinfo.changes b/texinfo.changes index 25ef419..9eee825 100644 --- a/texinfo.changes +++ b/texinfo.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 30 11:25:48 UTC 2021 - Dr. Werner Fink + +- Move to /usr for UsrMerge (boo#1191099) + ------------------------------------------------------------------- Thu Jan 28 14:01:49 UTC 2021 - Thorsten Kukuk diff --git a/texinfo.spec b/texinfo.spec index 90ce015..dafffbd 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -124,9 +124,15 @@ then ln -sf texi2pdf.1.gz %{buildroot}%{_mandir}/man1/pdftexi2dvi.1.gz fi +%if !0%{?usrmerged} mkdir -p %{buildroot}/sbin mv %{buildroot}%{_bindir}/install-info %{buildroot}/sbin/ ln -sf ../../sbin/install-info %{buildroot}%{_bindir}/install-info +%else +mkdir -p %{buildroot}%{_sbindir} +mv %{buildroot}%{_bindir}/install-info %{buildroot}%{_sbindir}/ +ln -sf ../sbin/install-info %{buildroot}%{_bindir}/install-info +%endif %find_lang %{name} %{name}.lang %find_lang %{name}_document %{name}_document.lang @@ -214,7 +220,11 @@ end %files -n info %defattr(-,root,root,0755) %ghost %verify(not md5 size mtime) %{_infodir}/dir +%if !0%{?usrmerged} /sbin/install-info +%else +%{_sbindir}/install-info +%endif %{_bindir}/install-info %{_bindir}/info %{_mandir}/man1/info.1%{?ext_man}