Update to 1.18 - Closes rhbz#1805337

- Swich homepage to https
- Use upstream lzip file, koji can handle it with the correct BuildRequire
- Check gpg signature
- Add check section
- Convert to rpmautospec
- Change from GPLv3+ to GPLv2
This commit is contained in:
Mikel Olasagasti Uranga 2022-03-18 21:18:36 +01:00
parent 719237d169
commit c3e1319fcb
4 changed files with 98 additions and 23 deletions

2
.gitignore vendored
View File

@ -11,3 +11,5 @@ ed-1.4.tar.gz
/ed-1.13.tar.bz2 /ed-1.13.tar.bz2
/ed-1.14.1.tar.bz2 /ed-1.14.1.tar.bz2
/ed-1.14.2.tar.xz /ed-1.14.2.tar.xz
/ed-1.18.tar.lz
/ed-1.18.tar.lz.sig

View File

@ -0,0 +1,56 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Comment: Hostname:
Version: Hockeypuck ~unreleased
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
=d3KY
-----END PGP PUBLIC KEY BLOCK-----

60
ed.spec
View File

@ -1,42 +1,58 @@
Summary: The GNU line editor Summary: The GNU line editor
Name: ed Name: ed
Version: 1.14.2 Version: 1.18
Release: %autorelease Release: %autorelease
License: GPLv3+ and GFDL
# Note: Upstream provides only lzip compressed tarballs which # The entire source is GPLv2 except doc/ed.info and doc/ed.texi, which are GFDL
# koji can't handle. Repackaging required: License: GPLv2 and GFDL
#Source: https://download.savannah.gnu.org/releases/ed/%{name}-%{version}.tar.lz URL: https://www.gnu.org/software/ed/
Source: %{name}-%{version}.tar.xz Source0: https://download.savannah.gnu.org/releases/ed/%{name}-%{version}.tar.lz
URL: http://www.gnu.org/software/ed/ Source1: https://download.savannah.gnu.org/releases/ed/%{name}-%{version}.tar.lz.sig
Source2: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x8FE99503132D7742#./antoniodiazdiaz-keyring.asc
BuildRequires: gcc BuildRequires: gcc
BuildRequires: make BuildRequires: make
Requires(post): info BuildRequires: lzip
Requires(preun): info # for gpg verification
BuildRequires: gnupg2
%description %description
Ed is a line-oriented text editor, used to create, display, and modify ed is a line-oriented text editor, used to create, display, and modify text
text files (both interactively and via shell scripts). For most files (both interactively and via shell scripts). For most purposes, ed has been
purposes, ed has been replaced in normal usage by full-screen editors replaced in normal usage by full-screen editors (emacs and vi, for example).
(emacs and vi, for example).
Ed was the original UNIX editor, and may be used by some programs. In
general, however, you probably don't need to install it and you probably
won't use it.
%prep %prep
%setup -q %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
%autosetup
%build %build
%configure %set_build_flags
%make_build CFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags}" # Custom configure script; not Autoconf, so we do not use %%configure macro
./configure \
--prefix=%{_prefix} \
--exec-prefix=%{_exec_prefix} \
--bindir=%{_bindir} \
--datarootdir=%{_datadir} \
--infodir=%{_infodir} \
--mandir=%{_mandir} \
--program-prefix=%{?_program_prefix} \
CC="${CC-gcc}" \
CPPFLAGS="${CPPFLAGS}" \
CFLAGS="${CFLAGS}" \
LDFLAGS="${LDFLAGS}"
%make_build
%install %install
%make_install %make_install
rm -vrf %{buildroot}%{_infodir}/dir rm -vrf %{buildroot}%{_infodir}/dir
%check
%make_build check
%files %files
%license COPYING %license COPYING doc/fdl.texi
%doc ChangeLog NEWS README TODO AUTHORS %doc ChangeLog NEWS README AUTHORS
%{_bindir}/ed %{_bindir}/ed
%{_bindir}/red %{_bindir}/red
%{_mandir}/man1/ed.1* %{_mandir}/man1/ed.1*

View File

@ -1 +1,2 @@
SHA512 (ed-1.14.2.tar.xz) = de838a6df785c7dc80f4b5ba84330bbe743983fd81218321d4ab84c4c3688fdafb4c005502f3228f0bfa2b6bcf342d64d9523ab73ee440b4f305a033f567cbc2 SHA512 (ed-1.18.tar.lz) = e5dac94697d63fb90cc17e3e653fa56309e9652cc25b2e98a0e21f1ed41e38c48bc33b5fc746275a59e702d1644d3af88f3d82598b482f7309f4e68aab783286
SHA512 (ed-1.18.tar.lz.sig) = f3df77755ac2b47825102b7c6d1774c8aee3f93e0824cebb6d7ea6cda50c1233673ed4c56c4ed135438e993399685cf45616c1fbeb85b2a8501059abe818908d