X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ed.spec;h=ce48b905c281b85bbecebdf84b594a72ecbd9bc1;hb=356782e81b06dccb76a2f8edf861706c32bdb436;hp=47c862270d025a43c04f638a00890808926c3c1f;hpb=eefb69c49c7fd536fef188d9e37fbd64fba321da;p=packages%2Fed.git

diff --git a/ed.spec b/ed.spec
index 47c8622..ce48b90 100644
--- a/ed.spec
+++ b/ed.spec
@@ -5,14 +5,17 @@ Summary(pl):	GNU edytor liniowy
 Summary(tr):	GNU satýr düzenleyici
 Name:		ed
 Version:	0.2
-Release:	14
+Release:	17
 Copyright:	GPL
 Group:		Applications/Editors
 Group(pl):	Aplikacje/Edytory
 Source:		ftp://prep.ai.mit.edu/pub/gnu/ed/%{name}-%{version}.tar.gz
-Patch:		ed-info.patch
-Prereq:		/sbin/install-info
-Buildroot:	/tmp/%{name}-%{version}-root
+Patch0:		ed-info.patch
+Patch1:		ed-autoconf.patch
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%define		_prefix		/usr
+%define		_exec_prefix	/
 
 %description
 This is the GNU line editor.  It is an implementation of one of the first
@@ -30,44 +33,40 @@ d'*nix. Certains programmes en ont besoin, mais en g
 probablement pas l'utilité.
 
 %description -l pl
-Ed jest GNU implementacj± standardowego, pierwszego unixowego edytora.
-Czê¶æ starszych programów mo¿e jeszcze korzystaæ z niego ale wiêkszo¶æ
-ju¿ prawdopodobnie nie potrzebuje ed.
+Ed jest GNU implementacj± standardowego, pierwszego edytora uniksowego.
+Czê¶æ starszych programów mo¿e jeszcze z niego korzystaæ, ale wiêkszo¶æ
+ju¿ prawdopodobnie go nie potrzebuje.
 
 %description -l tr
 Bu paket UN*X'in en eski metin düzenleyicilerinden birini içermektedir. Bazý
 yazýlýmlar hala bu programa gereksinim duymaktadýrlar.
 
 %prep
-%setup -q
-%patch -p1
+%setup  -q
+%patch0 -p1
+%patch1 -p1
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" \
-./configure %{_target_platform} \
-	--prefix=/usr \
-	--exec-prefix=/
+chmod +w configure
+autoconf
+LDFLAGS="-s"; export LDFLAGS
+%configure
 
 rm -f ed.info
 make 
 
 %install
-make prefix=$RPM_BUILD_ROOT/usr \
-    exec_prefix=$RPM_BUILD_ROOT install
-
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/red.1
-echo .so ed.1 > $RPM_BUILD_ROOT%{_mandir}/man1/red.1
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
-gzip -9nf $RPM_BUILD_ROOT/usr/{man/man1/*,info/*info*} \
+gzip -9nf $RPM_BUILD_ROOT{%{_mandir}/man1/*,%{_infodir}/*info*} \
 	NEWS POSIX README
 
 %post
-/sbin/install-info %{_infodir}/ed.info.gz /etc/info-dir
+[ -x /usr/sbin/fix-info-dir ] && /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
-%preun
-if [ "$1" = "0" ]; then
-	/sbin/install-info --delete %{_infodir}/ed.info.gz /etc/info-dir
-fi
+%postun
+[ -x /usr/sbin/fix-info-dir ] && /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -79,36 +78,3 @@ rm -rf $RPM_BUILD_ROOT
 
 %{_infodir}/ed.info.gz
 %{_mandir}/man1/*
-
-%changelog
-* Thu Apr 22 1999 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
-  [0.2-14]
-- recompiles on new rpm.
-
-* Thu Apr  1 1999 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
-  [0.2-13]
-- removed man group from man pages,
-- added gzipping %doc,
-- removed striping binaries (added LDFLAGS="-s" to ./configure env),
-- added ed-info.patch.
-
-* Tue Oct 06 1998 Wojtek ¦lusarczyk <wojtek@shadow.eu.org>
-  [0.2-6d]
-- translation modified for pl,
-- restricted ELF binary permission,
-- major modifications of the spec file.
-
-* Thu Jul 23 1998 Wojtek ¦lusarczyk <wojtek@shadow.eu.org>
-  [0.2-6]
-- build against glibc-2.1.
-
-* Mon Apr 27 1998 Prospector System <bugs@redhat.com>
-- translations modified for de, fr, tr
-
-* Fri Oct 17 1997 Donnie Barnes <djb@redhat.com>
-- added install-info support
-- added BuildRoot
-- correct URL in Source line
-
-* Mon Jun 02 1997 Erik Troan <ewt@redhat.com>
-- built against glibc