Accepting request 294287 from utilities

1

OBS-URL: https://build.opensuse.org/request/show/294287
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ed?expand=0&rev=24
This commit is contained in:
Dominique Leuenberger 2015-04-07 07:26:26 +00:00 committed by Git OBS Bridge
commit 451d6f2c6c
4 changed files with 28 additions and 16 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b8868c1391f5e91ea197a6efaab533941fd8aa2150cc146db1438a312f55ec20
size 66440

3
ed-1.11.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c5d3c257d77a4513522af92b556ec76a2220c53b2f41ff8a4049d827b7b163f3
size 64464

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri Apr 3 06:33:35 UTC 2015 - mpluskal@suse.com
- Cleanup spec file with spec-cleaner
- Update to 1.11
* main_loop.c (exec_command): Fixed 'z' command.
(zN printed N + 1 lines).
* ed.texi: Documented the window size used by the 'z' command.
* Makefile.in: Added new targets 'install*-compress'.
* Restored original copyright notices in the code. I assigned to
the FSF the copyright on changes made to the part of ed already
copyrighted by the FSF, which seems to be just the manual.
-------------------------------------------------------------------
Fri Feb 21 08:47:45 UTC 2014 - mvyskocil@suse.com

25
ed.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package ed
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,18 +17,17 @@
Name: ed
Version: 1.10
Version: 1.11
Release: 0
Summary: GNU ed is a line-oriented text editor
License: GPL-3.0+ and LGPL-2.1+
Group: Productivity/Editors/Other
Url: http://www.gnu.org/software/ed/
#DL_URL: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.lz
#mvyskocil: repackaged to xz in order to avoid adding lzip to bootstrap
Source0: ed-1.10.tar.xz
Requires(pre): %install_info_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.xz
BuildRequires: xz
Requires(preun): %{install_info_prereq}
Requires(post): %{install_info_prereq}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
GNU ed is a line-oriented text editor. It is used to create, display,
@ -47,18 +46,18 @@ sed -i \
configure
%build
%{configure}
%configure
make %{?_smp_mflags}
%install
%{makeinstall}
make DESTDIR=%{buildroot} install %{?_smp_mflags}
#UsrMerge
%{__install} -d -m 0755 %{buildroot}/bin
%{__ln_s} %{_bindir}/ed %{buildroot}/bin/ed
install -d -m 0755 %{buildroot}/bin
ln -s %{_bindir}/ed %{buildroot}/bin/ed
#UsrMerge
%check
make check
make %{?_smp_mflags} check
%files
%defattr(-,root,root)
@ -73,7 +72,7 @@ make check
%post
%install_info --entry="* ed: (ed). Line-oriented text editor" --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
%postun
%preun
%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
%changelog