- release 5

[packages/elvis.git] / elvis.spec

diff --git a/elvis.spec b/elvis.spec
index 2a75e6dcb397ac81509fde1f132df5ad1a552817..3b8a30bfc6d34b3d2c77e2694e0fb8ba36dc5e86 100644 (file)
--- a/elvis.spec
+++ b/elvis.spec
@@ -1,15 +1,17 @@
 Summary:       Elvis is a clone of vi/ex
 Summary(pl):   Elvis jest klonem edytora vi
 Name:          elvis
-Version:       2.1
-Release:       2
+Version:       2.2a
+Release:       5
 Copyright:     Artistic License
 Group:         Applications/Editors
+Group(pt):     X11/Aplicações/Editores
 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
+Source0:       ftp://ftp.cs.pdx.edu/pub/elvis/%{name}-%{version}.tar.gz
+BuildRequires: ncurses-devel >= 5.0
+BuildRequires: ncurses-static
+BuildRequires: XFree86-devel
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     elvis-X11
 
 %define                _libdir %{_datadir}
@@ -18,24 +20,25 @@ Obsoletes:  elvis-X11
 Vi clone.
 
 %description -l pl
-Elvis to jeden z popularniejszych klonów edytora vi. Jest szybki, posiada
-bogate mo¿liwo¶ci i bardzo dobr± dokumentacjê.
+Elvis to jeden z popularniejszych klonów edytora vi. Jest szybki,
+posiada bogate mo¿liwo¶ci i bardzo dobr± dokumentacjê.
 
 %package static
 Summary:       Static elvis
 Summary(pl):   elvis skompilowany statycznie
 Group:         Applications/Editors
+Group(pt):     X11/Aplicações/Editores
 Group(pl):     Aplikacje/Edytory
 Provides:      vi
 Obsoletes:     vi
 
 %description static
-The classic unix /bin/vi - small, static compiled editor which is useful
-as a rescue tool.
+The classic unix /bin/vi - small, static compiled editor which is
+useful as a rescue tool.
 
 %description static -l pl
-Klasyczny unixowy /bin/vi - ma³y, skompilowany statycznie edytor, który
-przydaje siê przy awarii systemu.
+Klasyczny unixowy /bin/vi - ma³y, skompilowany statycznie edytor,
+który przydaje siê przy awarii systemu.
 
 %prep
 %setup -q
@@ -44,18 +47,20 @@ przydaje si
 CC="cc $RPM_OPT_FLAGS"; export CC
 LDFLAGS="-static -s"; export LDFLAGS
 %configure \
-       --without-x
+       --without-x \
+       --datadir=%{_datadir}/elvis
        
-make LIBS="-lncurses"
+%{__make} LIBS="-ltinfo"
 mv elvis elvis.static
 
-make clean
+%{__make} clean
 
 LDFLAGS="-s";export LDFLAGS
 %configure \
-       --with-x
-       
-make LIBS="-lncurses -lX11 -L/usr/X11R6/lib"
+       --with-x \
+       --datadir=%{_datadir}/elvis
+
+%{__make} LIBS="-ltinfo -lX11 -L/usr/X11R6/lib"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -63,13 +68,13 @@ install -d $RPM_BUILD_ROOT/{bin,%{_bindir},%{_mandir}/man1,%{_datadir}/elvis}
 
 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
+install lib/*.man $RPM_BUILD_ROOT%{_mandir}/man1
 
 rm -f  lib/*.man
 mv lib/license .
 install        lib/* $RPM_BUILD_ROOT%{_libdir}/elvis
 
-gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man*/* \
+gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man1/* \
        license BUGS
 
 %clean
@@ -84,4 +89,5 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/elvis
 
 %files static
+%defattr(644,root,root,755)
 %attr(755,root,root) /bin/vi