Merge commit 'ea1929c25ae0d0879b3a509476057fb99bc6cc86' into f19

Conflicts:
	ed.spec

.gitignore

@@ -2,3 +2,4 @@ ed-1.4.tar.gz
 /ed-1.5.tar.gz
 /ed-1.6-1.fc18.src.rpm
 /ed-1.6.tar.gz
+/ed-1.8.tar.gz

ed.spec

@@ -1,14 +1,13 @@
 Summary: The GNU line editor
 Name: ed
-Version: 1.6
-Release: 3%{?dist}
+Version: 1.8
+Release: 1%{?dist}
 License: GPLv3+
 Group:  Applications/Text
 Source: ftp://ftp.gnu.org/gnu/ed/%{name}-%{version}.tar.gz
 URL:    http://www.gnu.org/software/ed/
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Ed is a line-oriented text editor, used to create, display, and modify
@@ -26,16 +25,16 @@ rm -f stamp-h.in
 
 %build
 %configure --exec-prefix=/
-make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" 
+make %{?_smp_mflags} CFLAGS="%{optflags}" 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-make install DESTDIR=$RPM_BUILD_ROOT \
+rm -rf %{buildroot}
+mkdir -p %{buildroot}/%{_mandir}/man1
+make install DESTDIR=%{buildroot} \
     bindir=/bin mandir=%{_mandir}
 
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir*
-gzip -9qnf  $RPM_BUILD_ROOT%{_infodir}/*
+rm -f %{buildroot}/%{_infodir}/dir*
+gzip -9qnf  %{buildroot}/%{_infodir}/*
 
 %post
 /sbin/install-info %{_infodir}/ed.info.gz %{_infodir}/dir --entry="* ed: (ed).                  The GNU Line Editor." || :
@@ -46,7 +45,6 @@ if [ $1 = 0 ] ; then
 fi
 
 %clean
-rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
@@ -56,6 +54,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/*
 
 %changelog
+* Tue May 14 2013 Karsten Hopp <karsten@redhat.com> 1.8-1
+- update to ed-1.8
+- spec file cleanups
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 

sources

@@ -1 +1 @@
-9a78593decccaa889523aa4bb555ed4b  ed-1.6.tar.gz
+2268d2344b3c52d23730acb2e3c942fe  ed-1.8.tar.gz