diff --git a/texinfo.changes b/texinfo.changes index 98b96cc..c058f67 100644 --- a/texinfo.changes +++ b/texinfo.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon May 6 16:05:29 UTC 2013 - schwab@linux-m68k.org + +- Don't package info.info, already part of emacs-info + ------------------------------------------------------------------- Tue Feb 12 09:35:09 UTC 2013 - schwab@suse.de diff --git a/texinfo.spec b/texinfo.spec index 5f55716..9af43f3 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -158,6 +158,7 @@ popd make DESTDIR=%{buildroot} \ infodir=%{_infodir} \ htmldir=%{_defaultdocdir}/texi2html install + rm -f %{buildroot}%{_infodir}/info.info* mkdir -p %{buildroot}/sbin mv %{buildroot}%{_bindir}/install-info %{buildroot}/sbin/ ln -sf ../../sbin/install-info %{buildroot}%{_bindir}/install-info @@ -195,11 +196,9 @@ test -n "%{buildroot}" && rm -rf %{buildroot} %post -n info %install_info --info-dir=%{_infodir} %{_infodir}/info-stnd.info.gz -%install_info --info-dir=%{_infodir} %{_infodir}/info.info.gz %postun -n info %install_info_delete --info-dir=%{_infodir} %{_infodir}/info-stnd.info.gz -%install_info_delete --info-dir=%{_infodir} %{_infodir}/info.info.gz %files %defattr(-, root, root) @@ -231,7 +230,6 @@ test -n "%{buildroot}" && rm -rf %{buildroot} %{_bindir}/install-info %{_bindir}/info %{_bindir}/infokey -%{_infodir}/info.info* %{_infodir}/info-stnd.info* %{_mandir}/man1/info.1* %{_mandir}/man1/infokey.1*