- fix path to libdir on amd64

[packages/elvis.git] / elvis.spec

diff --git a/elvis.spec b/elvis.spec
index 3b8a30bfc6d34b3d2c77e2694e0fb8ba36dc5e86..ed447ab6ad27271b529caa4dd528565a562de4b1 100644 (file)
--- a/elvis.spec
+++ b/elvis.spec
@@ -1,23 +1,24 @@
 Summary:       Elvis is a clone of vi/ex
 Summary(pl):   Elvis jest klonem edytora vi
 Name:          elvis
-Version:       2.2a
-Release:       5
-Copyright:     Artistic License
+Version:       2.2_0
+Release:       1
+Epoch:         1
+License:       Artistic (see LICENSE.html)
 Group:         Applications/Editors
-Group(pt):     X11/Aplicações/Editores
-Group(pl):     Aplikacje/Edytory
 Source0:       ftp://ftp.cs.pdx.edu/pub/elvis/%{name}-%{version}.tar.gz
+# Source0-md5: 6831b8df3e4a530395e66c2889783752
+URL:           http://elvis.vi-editor.org/
+BuildRequires: XFree86-devel
+BuildRequires: glibc-static
 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}
-
 %description
-Vi clone.
+Elvis is one of the most popular Vi clones. Its swift, well
+documented and has many features.
 
 %description -l pl
 Elvis to jeden z popularniejszych klonów edytora vi. Jest szybki,
@@ -27,13 +28,13 @@ posiada bogate mo
 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
+Obsoletes:     vim-static
+Obsoletes:     nvi
 
 %description static
-The classic unix /bin/vi - small, static compiled editor which is
+The classic unix /bin/vi - small, statically linked editor which is
 useful as a rescue tool.
 
 %description static -l pl
@@ -44,49 +45,49 @@ kt
 %setup -q
 
 %build
-CC="cc $RPM_OPT_FLAGS"; export CC
-LDFLAGS="-static -s"; export LDFLAGS
+CC="%{__cc} %{rpmcflags}"; export CC
 %configure \
        --without-x \
        --datadir=%{_datadir}/elvis
-       
-%{__make} LIBS="-ltinfo"
-mv elvis elvis.static
+
+%{__make} \
+       LIBS="%{rpmldflags} -static -ltinfo"
+mv -f elvis elvis.static
 
 %{__make} clean
 
-LDFLAGS="-s";export LDFLAGS
 %configure \
        --with-x \
        --datadir=%{_datadir}/elvis
 
-%{__make} LIBS="-ltinfo -lX11 -L/usr/X11R6/lib"
+%{__make} \
+       LIBS="%{rpmldflags} -ltinfo -lX11 -L/usr/X11R6/%{_lib}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/{bin,%{_bindir},%{_mandir}/man1,%{_datadir}/elvis}
+install -d $RPM_BUILD_ROOT{/bin,%{_bindir},%{_mandir}/man1,%{_datadir}/elvis}
+
+install elvis ref $RPM_BUILD_ROOT%{_bindir}
+install elvis.static $RPM_BUILD_ROOT/bin/vi
 
-install -s elvis ref $RPM_BUILD_ROOT%{_bindir}
-install -s elvis.static $RPM_BUILD_ROOT/bin/vi
-install lib/*.man $RPM_BUILD_ROOT%{_mandir}/man1
+for f in doc/{elv*,ref}.man ; do
+       install $f $RPM_BUILD_ROOT%{_mandir}/man1/`basename $f .man`.1
+done
 
-rm -f  lib/*.man
-mv lib/license .
-install        lib/* $RPM_BUILD_ROOT%{_libdir}/elvis
+cp -rf data/* $RPM_BUILD_ROOT%{_datadir}/elvis
 
-gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man1/* \
-       license BUGS
+mv -f doc/license.html LICENSE.html
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc {license,BUGS}.gz README.html
+%doc Announce* BUGS COPYING LICENSE.html README.html doc/howto.html
 %attr(755,root,root) %{_bindir}/elvis
 %attr(755,root,root) %{_bindir}/ref
 %{_mandir}/man1/*
-%{_libdir}/elvis
+%{_datadir}/elvis
 
 %files static
 %defattr(644,root,root,755)