Compare commits

..

1 commit

Author SHA1 Message Date
Benjamin A. Beasley
40a45917ca Fix unreadable BACKLOG and ChangeLog files 2021-10-09 10:13:58 -04:00
5 changed files with 165 additions and 260 deletions

3
.gitignore vendored
View file

@ -6,6 +6,3 @@
/wdiff-1.2.1.tar.gz
/wdiff-1.2.2.tar.gz
/wdiff-1.2.2.tar.gz.sig
/wdiff-1.2.3.tar.gz
/wdiff-1.2.3.tar.gz.sig
/gnu-keyring.gpg

114
changelog
View file

@ -1,114 +0,0 @@
* Mon Feb 08 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1.2.2-19
- Work around no “install -D” support in EPEL7
* Mon Feb 08 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1.2.2-18
- Improve summary and description text
- Build HTML and PDF versions of the documentation
- Add Latex2e to License field
* Sun Feb 07 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1.2.2-17
- Change URLs from HTTP to HTTPS
- Add source file signature verification
- Use %%make_build and %%make_install macros
- Reformatting and minor changes for personal style preference
- Fix man page glob
- Use less broad globs
- Add ABOUT-NLS, BACKLOG, and THANKS as %%doc files
- Rebuild configure script at build time
- Add a %%check section and run the tests
- Add ncurses-devel BR for termcap/curses support
- Add missing BR on gcc
- Rebuild man pages in RPM build
- Properly install license file (COPYING)
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Wed Apr 24 2019 Björn Esser <besser82@fedoraproject.org> - 1.2.2-12
- Remove hardcoded gzip suffix from GNU info pages
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Fri Apr 18 2014 Praveen Kumar <kumarpraveen.nitdgp@gmail.com> 1.2.2-1
- New release
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Thu Mar 14 2013 Praveen Kumar <kumarpraveen.nitdgp@gmail.com> 1.2.1-1
- New release
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Tue May 29 2012 Praveen Kumar <kumarpraveen.nitdgp@gmail.com> 1.1.2-1
- New release and fixed no bundled library issue
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Wed Nov 16 2011 Praveen Kumar <kumarpraveen.nitdgp@gmail.com> 1.1.0-1
- New release
* Thu Oct 20 2011 Praveen Kumar <kumarpraveen.nitdgp@gmail.com> 1.0.1-1
- New release
* Thu Sep 8 2011 Praveen Kumar <kumarpraveen.nitdgp@gmail.com> 1.0.0-1
- New release
* Fri Mar 4 2011 Praveen Kumar <kumarpraveen.nitdgp@gmail.com> 0.6.5-5
- Fix change log issue
* Tue Mar 1 2011 Praveen Kumar <kumarpraveen.nitdgp@gmail.com> 0.6.5-4
- Add find language tag
* Tue Mar 1 2011 Praveen Kumar <kumarpraveen.nitdgp@gmail.com> 0.6.5-3
- Removed unnecessary -gnulib translation files.
- Rpmlint warning fixed for ChangeLog not utf8 file.
- Adding %%doc files
* Tue Mar 1 2011 Praveen Kumar <kumarpraveen.nitdgp@gmail.com> 0.6.5-2
- Fix license,buildroot issue. Add find language tag.
* Tue Mar 1 2011 Praveen Kumar <kumarpraveen.nitdgp@gmail.com> 0.6.5-1
- Initial version of the package

BIN
gnu-keyring.gpg Normal file

Binary file not shown.

View file

@ -1,3 +1,2 @@
SHA512 (wdiff-1.2.3.tar.gz) = 5a5b004fe6fc4fdd90f85ddbc5b751b682224da83efc5fe90fbe7cdb0bc0f0e0fdd0e25c5e70223d738c280bb537cb88dee29599d1c33d9d10c491f56034a06d
SHA512 (wdiff-1.2.3.tar.gz.sig) = 6e8da9844734728cd38081a26af1a04d8881ef95a52263af308b442888985a6bf6ff1e7265deca41b6897f567173ea89836f73b002e0bb623284870bf7a69ffe
SHA512 (gnu-keyring.gpg) = 0860d845851d2216b7c99bfe9c8aa5c1883f5ec54153c40daba5295db46bc7a4fb15fb8954d8675324255a0c67e77589e83a13c9f70f9aac81fbf55a32231c85
SHA512 (wdiff-1.2.2.tar.gz) = 9272c225f4f61612197fe151cf8c913107169ac9fcd6c9f8472a0f56d9124d78a060944cea1b51489ca34311220f23638d043d43c733a3252cdbb7cceb1085ed
SHA512 (wdiff-1.2.2.tar.gz.sig) = 72db186b8d4ac1c81bdfb790cf08e82fd994938290f383756c683e68d0f4371c961f8e0b935b0cb1cc3947d4820b9d7a3e6f91a61e0570c9468d7da29d14ec7f

View file

@ -1,126 +1,23 @@
%bcond rebuild_mans 1
# As of 1.2.3, cannot autoreconf due to:
# configure:14538: error: undefined or overquoted macro: gl_PTHREADLIB
# configure:14651: error: undefined or overquoted macro: gl_WEAK_SYMBOLS
# configure:15859: error: undefined or overquoted macro: gl_TYPE_WINT_T_PREREQ
%bcond autoreconf 0
%bcond_without rebuild_mans
Name: wdiff
Version: 1.2.3
Release: %autorelease
Version: 1.2.2
Release: 20%{?dist}
Summary: Compare files on a word per word basis
# Entire source is GPL-3.0-or-later, except:
#
# Latex2e:
# wdiff.texi and the documentation built from it, including info, HTML, and
# PDF documentation, to include doc/wdiff.info in the source tree.
# LGPL-2.0-or-later:
# lib/_Noreturn.h
# lib/arg-nonnull.h
# lib/c++defs.h
# lib/warn-on-use.h
# LGPL-2.1-or-later:
# the entire contents of lib/, except:
# - those listed as LGPL-2.0-or-later, above
# - lib/Makefile.{am,in}, which are build-system files and are documented
# above SourceLicense, and
# - the following, which are GPL-3.0-or-later:
# lib/xalloc-die.c lib/xalloc.h lib/xmalloc.c
# lib/*/*.*
License: %{shrink:
GPL-3.0-or-later AND
LGPL-2.0-or-later AND
LGPL-2.1-or-later AND
Latex2e
}
# Additionally, build-system files do not contribute to the licenses of the
# binary RPMs, and some of these are under other licenses:
#
# FSFAP:
# AUTHORS
# config.h.in (inasmuch as it is derived from configure.ac, which is
# explicitly so licensed)
# configure.ac
# INSTALL
# Makefile.am
# README
# THANKS
# TODO
# doc/Makefile.am
# man/Makefile.am
# po/POTFILES.in
# src/Makefile.am
# FSFAP AND FSFULLRWD: (Each is documented as FSFULLRWD, but derived from a
# corresponding Makefile.am that is FSFAP.)
# Makefile.in
# doc/Makefile.in
# man/Makefile.in
# src/Makefile.in
# FSFAP-no-warranty-disclaimer:
# configure
# build-aux/config.rpath
# FSFUL:
# tests/testsuite
# FSFULLR AND FSFULLRWD:
# aclocal.m4
# FSFULLRWD AND GPL-3.0-or-later WITH Autoconf-exception-generic:
# lib/Makefile.in
# FSFULLRWD:
# m4/*, except:
# - m4/gnulib-cache.m4
# - m4/gnulib-comp.m4
# - m4/init-package-version.m4
# GPL-2.0-or-later:
# build-aux/gnupload
# GPL-2.0-or-later WITH Autoconf-exception-generic:
# build-aux/compile
# build-aux/depcomp
# build-aux/mdate-sh
# build-aux/missing
# m4/init-package-version.m4
# GPL-3.0-or-later WITH Autoconf-exception-generic:
# lib/Makefile.am
# m4/gnulib-cache.m4
# m4/gnulib-comp.m4
# GPL-3.0-or-later WITH Autoconf-exception-generic-3.0:
# build-aux/config.guess
# build-aux/config.sub
# GPL-3.0-or-later WITH Texinfo-exception:
# build-aux/texinfo.tex
# X11 AND LicenseRef-Fedora-Public-Domain:
# build-aux/install (“FSF changes to this file are in the public domain.”)
SourceLicense: %{shrink:
%{license} AND
FSFAP AND
FSFAP-no-warranty-disclaimer AND
FSFUL AND
FSFULLR AND
FSFULLRWD AND
GPL-2.0-or-later AND
GPL-2.0-or-later WITH Autoconf-exception-generic AND
GPL-3.0-or-later WITH Autoconf-exception-generic AND
GPL-3.0-or-later WITH Autoconf-exception-generic-3.0 AND
GPL-3.0-or-later WITH Texinfo-exception AND
LicenseRef-Fedora-Public-Domain AND
X11
}
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
# Fetched 2026-08-13:
# 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
Source2: https://ftp.gnu.org/gnu/gnu-keyring.gpg
# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
ExcludeArch: %{ix86}
BuildRequires: gcc
BuildRequires: make
%if %{with autoreconf}
BuildRequires: automake
BuildRequires: autoconf
BuildRequires: libtool
%endif
BuildRequires: gettext-devel
BuildRequires: ncurses-devel
@ -130,11 +27,10 @@ BuildRequires: texinfo
BuildRequires: texinfo-tex
BuildRequires: tex(latex)
BuildRequires: gpgverify
BuildRequires: gnupg2
# https://fedorahosted.org/fpc/ticket/174
# Unclear which version of gnulib is currently bundled.
Provides: bundled(gnulib)
#https://fedorahosted.org/fpc/ticket/174
Provides: bundled(gnulib) = 30.5.2012
%description
The GNU wdiff program is a front end to diff for comparing files on a word per
@ -147,62 +43,189 @@ produce a nicer display of word differences between the original files.
%prep
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
%autosetup -p1
%setup -q
%conf
%if %{with autoreconf}
autoreconf --force --install --verbose
%endif
%configure --enable-experimental="mdiff wdiff2 unify"
# Fix ISO-8859-1-encoded files
for fn in BACKLOG ChangeLog
do
iconv --from=ISO-8859-1 --to=UTF-8 "${fn}" > "${fn}.iconv"
touch -r "${fn}" "${fn}.iconv"
chmod -v --reference="${fn}" "${fn}.iconv"
mv -f "${fn}.iconv" "${fn}"
done
%build
autoreconf -fiv
%configure --enable-experimental="mdiff wdiff2 unify"
%make_build all
%if %{with rebuild_mans}
rm --verbose man/mdiff.1 man/wdiff.1 man/wdiff2.1 man/unify.1
%make_build --directory=man mdiff.1 wdiff.1 wdiff2.1 unify.1
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
%endif
# Make sure we rebuild the info page too.
rm --verbose doc/wdiff.info
%make_build --directory=doc info html pdf
rm -v doc/%{name}.info
%make_build -C doc info html pdf
%install
%make_install
find '%{buildroot}' -type f -name '*gnulib.mo' -print -delete
rm '%{buildroot}%{_infodir}/dir'
install --directory '%{buildroot}%{_pkgdocdir}'
install --preserve-timestamp --mode=0644 --target='%{buildroot}%{_pkgdocdir}' \
ABOUT-NLS AUTHORS BACKLOG ChangeLog NEWS README THANKS TODO
cp --recursive --preserve doc/wdiff.html '%{buildroot}%{_pkgdocdir}/html'
install -d '%{buildroot}%{_pkgdocdir}'
install -t '%{buildroot}%{_pkgdocdir}' -p -m 0644 \
ABOUT-NLS \
AUTHORS \
BACKLOG \
ChangeLog \
NEWS \
README \
THANKS \
TODO
cp -rp doc/%{name}.html %{buildroot}%{_pkgdocdir}/html
%find_lang wdiff
%find_lang %{name}
%check
%make_build check
%files -f wdiff.lang
%files -f %{name}.lang
%license COPYING
%{_bindir}/mdiff
%{_bindir}/wdiff
%{_bindir}/wdiff2
%{_bindir}/%{name}
%{_bindir}/%{name}2
%{_bindir}/unify
%{_mandir}/man1/mdiff.1*
%{_mandir}/man1/wdiff.1*
%{_mandir}/man1/wdiff2.1*
%{_mandir}/man1/%{name}.1*
%{_mandir}/man1/%{name}2.1*
%{_mandir}/man1/unify.1*
%{_infodir}/wdiff.info.*
%{_infodir}/%{name}.info.*
%{_pkgdocdir}/
%{_pkgdocdir}
%changelog
%autochangelog
* Sat Oct 09 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1.2.2-20
- Fix unreadable BACKLOG and ChangeLog files
* Mon Feb 08 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1.2.2-19
- Work around no “install -D” support in EPEL7
* Mon Feb 08 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1.2.2-18
- Improve summary and description text
- Build HTML and PDF versions of the documentation
- Add Latex2e to License field
* Sun Feb 07 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1.2.2-17
- Change URLs from HTTP to HTTPS
- Add source file signature verification
- Use %%make_build and %%make_install macros
- Reformatting and minor changes for personal style preference
- Fix man page glob
- Use less broad globs
- Add ABOUT-NLS, BACKLOG, and THANKS as %%doc files
- Rebuild configure script at build time
- Add a %%check section and run the tests
- Add ncurses-devel BR for termcap/curses support
- Add missing BR on gcc
- Rebuild man pages in RPM build
- Properly install license file (COPYING)
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Wed Apr 24 2019 Björn Esser <besser82@fedoraproject.org> - 1.2.2-12
- Remove hardcoded gzip suffix from GNU info pages
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Fri Apr 18 2014 Praveen Kumar <kumarpraveen.nitdgp@gmail.com> 1.2.2-1
- New release
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Thu Mar 14 2013 Praveen Kumar <kumarpraveen.nitdgp@gmail.com> 1.2.1-1
- New release
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Tue May 29 2012 Praveen Kumar <kumarpraveen.nitdgp@gmail.com> 1.1.2-1
- New release and fixed no bundled library issue
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Wed Nov 16 2011 Praveen Kumar <kumarpraveen.nitdgp@gmail.com> 1.1.0-1
- New release
* Thu Oct 20 2011 Praveen Kumar <kumarpraveen.nitdgp@gmail.com> 1.0.1-1
- New release
* Thu Sep 8 2011 Praveen Kumar <kumarpraveen.nitdgp@gmail.com> 1.0.0-1
- New release
* Fri Mar 4 2011 Praveen Kumar <kumarpraveen.nitdgp@gmail.com> 0.6.5-5
- Fix change log issue
* Tue Mar 1 2011 Praveen Kumar <kumarpraveen.nitdgp@gmail.com> 0.6.5-4
- Add find language tag
* Tue Mar 1 2011 Praveen Kumar <kumarpraveen.nitdgp@gmail.com> 0.6.5-3
- Removed unnecessary -gnulib translation files.
- Rpmlint warning fixed for ChangeLog not utf8 file.
- Adding %%doc files
* Tue Mar 1 2011 Praveen Kumar <kumarpraveen.nitdgp@gmail.com> 0.6.5-2
- Fix license,buildroot issue. Add find language tag.
* Tue Mar 1 2011 Praveen Kumar <kumarpraveen.nitdgp@gmail.com> 0.6.5-1
- Initial version of the package