X-Git-Url: http://git.pld-linux.org/?p=packages%2Felvis.git;a=blobdiff_plain;f=elvis.spec;h=87802293d1f4a27088bbe5311bbdf28b1b16a98a;hp=68e7ec4b08b867dabc38518e90bfc53e3f56e2a6;hb=ac6ef9bb91d07ede2c3603f6bfdf69c883b30ed5;hpb=fbada27f8a3db15d289e081d4143c751c1b75dfd

diff --git a/elvis.spec b/elvis.spec
index 68e7ec4..8780229 100644
--- a/elvis.spec
+++ b/elvis.spec
@@ -2,14 +2,14 @@ Summary:	Elvis is a clone of vi/ex
 Summary(pl):	Elvis jest klonem edytora vi
 Name:		elvis
 Version:	2.1
-Release:	1
+Release:	2
 Copyright:	Artistic License
 Group:		Applications/Editors
 Group(pl):	Aplikacje/Edytory
 Source:		ftp://ftp.cs.pdx.edu/pub/elvis/%{name}-%{version}.tar.gz
 BuildPrereq:	ncurses-devel
 BuildPrereq:	XFree86-devel
-BuildRoot:   	/tmp/%{name}-%{version}-root
+BuildRoot:	/tmp/%{name}-%{version}-root
 Obsoletes:	elvis-X11
 
 %description
@@ -43,7 +43,7 @@ CC="cc $RPM_OPT_FLAGS" LDFLAGS="-static -s" \
 ./configure \
 	--prefix=/usr \
 	--without-x \
-	%{_target}
+	%{_target_platform}
 	
 make LIBS="-lncurses"
 mv elvis elvis.static
@@ -54,17 +54,17 @@ CC="cc $RPM_OPT_FLAGS" LDFLAGS="-s" \
 ./configure \
 	--prefix=/usr \
 	--with-x \
-	%{_target}
+	%{_target_platform}
 	
 make LIBS="-lncurses -lX11 -L/usr/X11R6/lib"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/{bin,usr/{bin,man/man1,lib/elvis}}
+install -d $RPM_BUILD_ROOT/{bin,usr/{bin,share/man/man1,lib/elvis}}
 
-install -s elvis	$RPM_BUILD_ROOT/usr/bin
+install -s elvis	$RPM_BUILD_ROOT%{_bindir}
 install -s elvis.static	$RPM_BUILD_ROOT/bin/vi
-install -s ref		$RPM_BUILD_ROOT/usr/bin/
+install -s ref		$RPM_BUILD_ROOT%{_bindir}/
 install lib/ref.man	$RPM_BUILD_ROOT%{_mandir}/man1
 
 rm -f	lib/*.man
@@ -80,8 +80,8 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc {license,BUGS}.gz README.html
-%attr(755,root,root) /usr/bin/elvis
-%attr(755,root,root) /usr/bin/ref
+%attr(755,root,root) %{_bindir}/elvis
+%attr(755,root,root) %{_bindir}/ref
 %{_mandir}/man1/*
 %{_libdir}/elvis
 
@@ -89,6 +89,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) /bin/vi
 
 %changelog
+* Mon Jun 07 1999 Jan Rêkorajski <baggins@pld.org.pl>
+  [2.1-2]
+- spec cleanup
+
 * Wed Apr 28 1999 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
   [2.1-1]
 - added BuildPrereq rules,