From 5c54ffced14c6f4e677d6b1be593623ce393afbd Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 8 Oct 2021 20:00:57 -0400 Subject: [PATCH] Reduce spec file macro indirection --- wdiff.spec | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/wdiff.spec b/wdiff.spec index 3ba6404..fffbb37 100644 --- a/wdiff.spec +++ b/wdiff.spec @@ -8,9 +8,9 @@ Summary: Compare files on a word per word basis # Entire source is GPLv3+, except wdiff.texi and the documentation built from # it, including info, HTML, and PDF documentation, which is Latex2e. License: GPLv3+ and Latex2e -URL: https://www.gnu.org/software/%{name}/ -Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz -Source1: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz.sig +URL: https://www.gnu.org/software/wdiff/ +Source0: https://ftp.gnu.org/gnu/wdiff/wdiff-%{version}.tar.gz +Source1: https://ftp.gnu.org/gnu/wdiff/wdiff-%{version}.tar.gz.sig Source2: https://ftp.gnu.org/gnu/gnu-keyring.gpg BuildRequires: gcc @@ -61,12 +61,12 @@ autoreconf -fiv %make_build all %if %{with rebuild_mans} -rm -v man/mdiff.1 man/%{name}.1 man/%{name}2.1 man/unify.1 -%make_build -C man mdiff.1 %{name}.1 %{name}2.1 unify.1 +rm -v man/mdiff.1 man/wdiff.1 man/wdiff2.1 man/unify.1 +%make_build -C man mdiff.1 wdiff.1 wdiff2.1 unify.1 %endif # Make sure we rebuild the info page too. -rm -v doc/%{name}.info +rm -v doc/wdiff.info %make_build -C doc info html pdf @@ -84,29 +84,29 @@ install -t '%{buildroot}%{_pkgdocdir}' -p -m 0644 \ README \ THANKS \ TODO -cp -rp doc/%{name}.html %{buildroot}%{_pkgdocdir}/html +cp -rp doc/wdiff.html %{buildroot}%{_pkgdocdir}/html -%find_lang %{name} +%find_lang wdiff %check %make_build check -%files -f %{name}.lang +%files -f wdiff.lang %license COPYING %{_bindir}/mdiff -%{_bindir}/%{name} -%{_bindir}/%{name}2 +%{_bindir}/wdiff +%{_bindir}/wdiff2 %{_bindir}/unify %{_mandir}/man1/mdiff.1* -%{_mandir}/man1/%{name}.1* -%{_mandir}/man1/%{name}2.1* +%{_mandir}/man1/wdiff.1* +%{_mandir}/man1/wdiff2.1* %{_mandir}/man1/unify.1* -%{_infodir}/%{name}.info.* +%{_infodir}/wdiff.info.* %{_pkgdocdir}