Accepting request 449078 from home:pluskalm:branches:utilities

- Update to version 1.14:

OBS-URL: https://build.opensuse.org/request/show/449078
OBS-URL: https://build.opensuse.org/package/show/utilities/ed?expand=0&rev=24

ed.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ed
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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,16 +17,16 @@
 
 
 Name:           ed
-Version:        1.13
+Version:        1.14
 Release:        0
 Summary:        GNU ed is a line-oriented text editor
 License:        GPL-3.0+ and LGPL-2.1+
-Group:          Productivity/Editors/Other
+Group:          Productivity/Text/Editors
 Url:            http://www.gnu.org/software/ed/
 Source0:        %{name}-%{version}.tar.xz
 BuildRequires:  xz
-Requires(preun): %{install_info_prereq}
 Requires(post): %{install_info_prereq}
+Requires(preun): %{install_info_prereq}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -40,17 +40,13 @@ superseded by full-screen editors such as GNU Emacs or GNU Moe.
 
 %prep
 %setup -q
-sed -i \
-    -e "s/CFLAGS='.*/CFLAGS='%{optflags}'/" \
-    -e "s/CXXFLAGS='.*/CXXFLAGS='%{optflags}'/" \
-    configure
 
 %build
 %configure
-make %{?_smp_mflags}
+make %{?_smp_mflags} CFLAGS="%{optflags}"
 
 %install
-make %{?_smp_mflags} DESTDIR=%{buildroot} install
+%make_install
 #UsrMerge
 install -d -m 0755 %{buildroot}/bin
 ln -s %{_bindir}/ed %{buildroot}/bin/ed
@@ -60,10 +56,10 @@ ln -s %{_bindir}/ed %{buildroot}/bin/ed
 make %{?_smp_mflags} check
 
 %post
-%install_info --entry="* ed: (ed). Line-oriented text editor" --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
+%install_info --entry="* ed: (ed). Line-oriented text editor" --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info}
 
 %preun
-%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
+%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info}
 
 %files
 %defattr(-,root,root)
@@ -71,7 +67,7 @@ make %{?_smp_mflags} check
 /bin/%{name}
 %{_bindir}/%{name}
 %{_bindir}/r%{name}
-%{_infodir}/%{name}.info.*
+%{_infodir}/%{name}.info%{ext_info}
 %{_mandir}/man1/%{name}.1%{ext_man}
 %{_mandir}/man1/r%{name}.1%{ext_man}