- switch to rpm 3.0.2

[packages/elvis.git] / elvis.spec

diff --git a/elvis.spec b/elvis.spec
index 68e7ec4b08b867dabc38518e90bfc53e3f56e2a6..b8691ed405ec0f871990c0fbbc1b6c13c9e9cffb 100644 (file)
--- a/elvis.spec
+++ b/elvis.spec
@@ -2,16 +2,18 @@ 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
+BuildRequires: ncurses-devel
+BuildRequires: XFree86-devel
+BuildRoot:     /tmp/%{name}-%{version}-root
 Obsoletes:     elvis-X11
 
+%define                _libdir %{_datadir}
+
 %description
 Vi clone.
 
@@ -39,37 +41,33 @@ przydaje si
 %setup -q
 
 %build
-CC="cc $RPM_OPT_FLAGS" LDFLAGS="-static -s" \
-./configure \
-       --prefix=/usr \
-       --without-x \
-       %{_target}
+CC="cc $RPM_OPT_FLAGS"; export CC
+LDFLAGS="-static -s"; export LDFLAGS
+%configure \
+       --without-x
        
 make LIBS="-lncurses"
 mv elvis elvis.static
 
 make clean
 
-CC="cc $RPM_OPT_FLAGS" LDFLAGS="-s" \
-./configure \
-       --prefix=/usr \
-       --with-x \
-       %{_target}
+LDFLAGS="-s";export LDFLAGS
+%configure \
+       --with-x
        
 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,%{_bindir},%{_mandir}/man1,%{_datadir}/elvis}
 
-install -s elvis       $RPM_BUILD_ROOT/usr/bin
-install -s elvis.static        $RPM_BUILD_ROOT/bin/vi
-install -s ref         $RPM_BUILD_ROOT/usr/bin/
-install lib/ref.man    $RPM_BUILD_ROOT%{_mandir}/man1
+install -s elvis ref $RPM_BUILD_ROOT%{_bindir}
+install -s elvis.static $RPM_BUILD_ROOT/bin/vi
+install lib/ref.man $RPM_BUILD_ROOT%{_mandir}/man1
 
 rm -f  lib/*.man
 mv lib/license .
-install        lib/*           $RPM_BUILD_ROOT%{_libdir}/elvis
+install        lib/* $RPM_BUILD_ROOT%{_libdir}/elvis
 
 gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man*/* \
        license BUGS
@@ -80,19 +78,10 @@ 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
 
 %files static
 %attr(755,root,root) /bin/vi
-
-%changelog
-* Wed Apr 28 1999 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
-  [2.1-1]
-- added BuildPrereq rules,
-- added "Obsoletes: elvis-X11" (on contrib is avalaible this package).
-
-* Tue Apr 27 1999 Micha³ Kuratczyk <kura@pld.org.pl>
-- built for PLD