From e829fdab7e0dc0bd869fe2b8082f52b48f6f921a Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Mon, 2 Feb 2015 13:46:49 +0100 Subject: [PATCH] Add macros.info --- macros.info | 15 +++++++++++++++ texinfo.spec | 12 +++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 macros.info diff --git a/macros.info b/macros.info new file mode 100644 index 0000000..cd29c07 --- /dev/null +++ b/macros.info @@ -0,0 +1,15 @@ +%info_requires \ +Requires(post): /usr/sbin/install-info \ +Requires(preun): /usr/sbin/install-info + +%info_post() \ +if [ -f %{_infodir}/%1 ]; then # --excludedocs? \ + /usr/sbin/install-info %{_infodir}/%1 %{_infodir}/dir || : \ +fi + +%info_preun() \ +if [ $1 == 0 ]; then \ + if [ -f %{_infodir}/%1 ]; then # --excludedocs? \ + /usr/sbin/install-info --delete %{_infodir}/%1 %{_infodir}/dir || : \ + fi \ +fi diff --git a/texinfo.spec b/texinfo.spec index 6f5e874..d4bccec 100644 --- a/texinfo.spec +++ b/texinfo.spec @@ -5,7 +5,7 @@ Summary: Tools needed to create Texinfo format documentation files Name: texinfo Version: 5.2 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv3+ Group: Applications/Publishing Url: http://www.gnu.org/software/texinfo/ @@ -16,6 +16,8 @@ Source2: info-dir Source3: filter-requires-texinfo.sh # Source4: script for filtering out false perl provides Source4: filter-provides-texinfo.sh +# Source5: macro definitions +Source5: macros.info Patch0: texinfo-4.12-zlib.patch Patch1: texinfo-4.13a-powerpc.patch # Patch2: bz#1053129, already upstream @@ -87,6 +89,9 @@ install -p -m644 doc/texinfo.tex doc/txi-??.tex $RPM_BUILD_ROOT%{tex_texinfo} install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_infodir}/dir mv $RPM_BUILD_ROOT%{_bindir}/install-info $RPM_BUILD_ROOT/sbin +mkdir -p $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d +cp %{SOURCE5} $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d + %find_lang %{name} %find_lang %{name}_document @@ -156,6 +161,7 @@ fi %{_mandir}/man1/infokey.1* %{_mandir}/man1/install-info.1* %{_mandir}/man5/info.5* +%{_rpmconfigdir}/macros.d/macros.info %files tex %{_bindir}/texindex @@ -169,6 +175,10 @@ fi %{_mandir}/man1/pdftexi2dvi.1* %changelog +* Mon Feb 02 2015 Vitezslav Crhonek - 5.2-8 +- Add macros.info + Resolves: #948735 + * Thu Oct 30 2014 Vitezslav Crhonek - 5.2-7 - Filter bogus perl requires/provides - Enable upstream test suite