Compare commits

..

2 Commits
epel9 ... i9ce

Author SHA1 Message Date
MSVSphere Packaging Team 4409a69e80 Merge and update to 1.2.2-42
1 year ago
MSVSphere Packaging Team 71f058cb51 Remove unnecessary files and fix spec-file
1 year ago

10
.gitignore vendored

@ -1,8 +1,2 @@
/wdiff-0.6.5.tar.gz SOURCES/gnu-keyring.gpg
/wdiff-1.0.0.tar.gz SOURCES/wdiff-1.2.2.tar.gz
/wdiff-1.0.1.tar.gz
/wdiff-1.1.0.tar.gz
/wdiff-1.1.2.tar.gz
/wdiff-1.2.1.tar.gz
/wdiff-1.2.2.tar.gz
/wdiff-1.2.2.tar.gz.sig

@ -0,0 +1,2 @@
358091358feb78dbb1b46dd3875c772335b3da80 SOURCES/gnu-keyring.gpg
c93b5cb593257d814212e15fc371ff6c6b952c3d SOURCES/wdiff-1.2.2.tar.gz

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
iEYEABECAAYFAlNMQlQACgkQRhp6o4m9dFslzgCgmQOsyG7Cya4BUpRwoog+TrEs
faEAn0Qw7vmPRvN9aQJ8LWL+xh5YKNmX
=mDRK
-----END PGP SIGNATURE-----

@ -1,3 +1,135 @@
## START: Set by rpmautospec
## (rpmautospec version 0.2.5)
%define autorelease(e:s:pb:) %{?-p:0.}%{lua:
release_number = 42;
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
print(release_number + base_release_number - 1);
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{?dist}
## END: Set by rpmautospec
%bcond_without rebuild_mans
Name: wdiff
Version: 1.2.2
Release: %autorelease
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/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
BuildRequires: make
BuildRequires: automake
BuildRequires: autoconf
BuildRequires: libtool
BuildRequires: gettext-devel
BuildRequires: ncurses-devel
BuildRequires: help2man
BuildRequires: texinfo
BuildRequires: texinfo-tex
BuildRequires: tex(latex)
BuildRequires: gnupg2
#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
word basis. A word is anything between whitespace. This is useful for comparing
two texts in which a few words have been changed and for which paragraphs have
been refilled. It works by creating two temporary files, one word per line, and
then executes diff on these files. It collects the diff output and uses it to
produce a nicer display of word differences between the original files.
%prep
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
%setup -q
# 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 -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/wdiff.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 -d '%{buildroot}%{_pkgdocdir}'
install -t '%{buildroot}%{_pkgdocdir}' -p -m 0644 \
ABOUT-NLS \
AUTHORS \
BACKLOG \
ChangeLog \
NEWS \
README \
THANKS \
TODO
cp -rp doc/wdiff.html %{buildroot}%{_pkgdocdir}/html
%find_lang wdiff
%check
%make_build check
%files -f wdiff.lang
%license COPYING
%{_bindir}/mdiff
%{_bindir}/wdiff
%{_bindir}/wdiff2
%{_bindir}/unify
%{_mandir}/man1/mdiff.1*
%{_mandir}/man1/wdiff.1*
%{_mandir}/man1/wdiff2.1*
%{_mandir}/man1/unify.1*
%{_infodir}/wdiff.info.*
%{_pkgdocdir}
%changelog
* Fri Nov 10 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.2.2-42
- Rebuilt for MSVSphere 9.3
* Sat Oct 09 2021 Benjamin A. Beasley <code@musicinmybrain.net> 1.2.2-42
- Reduce spec file macro indirection
* Fri Oct 08 2021 Benjamin A. Beasley <code@musicinmybrain.net> 1.2.2-41
- Fix unreadable BACKLOG and ChangeLog files
* Mon Feb 08 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1.2.2-19 * Mon Feb 08 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1.2.2-19
- Work around no “install -D” support in EPEL7 - Work around no “install -D” support in EPEL7
@ -112,3 +244,4 @@
* Tue Mar 1 2011 Praveen Kumar <kumarpraveen.nitdgp@gmail.com> 0.6.5-1 * Tue Mar 1 2011 Praveen Kumar <kumarpraveen.nitdgp@gmail.com> 0.6.5-1
- Initial version of the package - Initial version of the package

Binary file not shown.

@ -1,2 +0,0 @@
SHA512 (wdiff-1.2.2.tar.gz) = 9272c225f4f61612197fe151cf8c913107169ac9fcd6c9f8472a0f56d9124d78a060944cea1b51489ca34311220f23638d043d43c733a3252cdbb7cceb1085ed
SHA512 (wdiff-1.2.2.tar.gz.sig) = 72db186b8d4ac1c81bdfb790cf08e82fd994938290f383756c683e68d0f4371c961f8e0b935b0cb1cc3947d4820b9d7a3e6f91a61e0570c9468d7da29d14ec7f

@ -1,115 +0,0 @@
%bcond_without rebuild_mans
Name: wdiff
Version: 1.2.2
Release: %autorelease
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/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
BuildRequires: make
BuildRequires: automake
BuildRequires: autoconf
BuildRequires: libtool
BuildRequires: gettext-devel
BuildRequires: ncurses-devel
BuildRequires: help2man
BuildRequires: texinfo
BuildRequires: texinfo-tex
BuildRequires: tex(latex)
BuildRequires: gnupg2
#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
word basis. A word is anything between whitespace. This is useful for comparing
two texts in which a few words have been changed and for which paragraphs have
been refilled. It works by creating two temporary files, one word per line, and
then executes diff on these files. It collects the diff output and uses it to
produce a nicer display of word differences between the original files.
%prep
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
%setup -q
# 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 -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/wdiff.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 -d '%{buildroot}%{_pkgdocdir}'
install -t '%{buildroot}%{_pkgdocdir}' -p -m 0644 \
ABOUT-NLS \
AUTHORS \
BACKLOG \
ChangeLog \
NEWS \
README \
THANKS \
TODO
cp -rp doc/wdiff.html %{buildroot}%{_pkgdocdir}/html
%find_lang wdiff
%check
%make_build check
%files -f wdiff.lang
%license COPYING
%{_bindir}/mdiff
%{_bindir}/wdiff
%{_bindir}/wdiff2
%{_bindir}/unify
%{_mandir}/man1/mdiff.1*
%{_mandir}/man1/wdiff.1*
%{_mandir}/man1/wdiff2.1*
%{_mandir}/man1/unify.1*
%{_infodir}/wdiff.info.*
%{_pkgdocdir}
%changelog
%autochangelog
Loading…
Cancel
Save