- fix path to libdir on amd64

[packages/elvis.git] / elvis.spec

diff --git a/elvis.spec b/elvis.spec
index 567e92962f5c8d9ef07ec439f3152fbfcdaebc35..ed447ab6ad27271b529caa4dd528565a562de4b1 100644 (file)
--- a/elvis.spec
+++ b/elvis.spec
@@ -1,98 +1,94 @@
 Summary:       Elvis is a clone of vi/ex
 Summary(pl):   Elvis jest klonem edytora vi
 Name:          elvis
-Version:       2.1
+Version:       2.2_0
 Release:       1
-Copyright:     Artistic License
+Epoch:         1
+License:       Artistic (see LICENSE.html)
 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
+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
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     elvis-X11
 
 %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, 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(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 useful
-as a rescue tool.
+The classic unix /bin/vi - small, statically linked 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
 
 %build
-CC="cc $RPM_OPT_FLAGS" LDFLAGS="-static -s" \
-./configure \
-       --prefix=/usr \
+CC="%{__cc} %{rpmcflags}"; export CC
+%configure \
        --without-x \
-       %{_target}
-       
-make LIBS="-lncurses"
-mv elvis elvis.static
+       --datadir=%{_datadir}/elvis
 
-make clean
+%{__make} \
+       LIBS="%{rpmldflags} -static -ltinfo"
+mv -f elvis elvis.static
 
-CC="cc $RPM_OPT_FLAGS" LDFLAGS="-s" \
-./configure \
-       --prefix=/usr \
+%{__make} clean
+
+%configure \
        --with-x \
-       %{_target}
-       
-make LIBS="-lncurses -lX11 -L/usr/X11R6/lib"
+       --datadir=%{_datadir}/elvis
+
+%{__make} \
+       LIBS="%{rpmldflags} -ltinfo -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 elvis ref $RPM_BUILD_ROOT%{_bindir}
+install elvis.static $RPM_BUILD_ROOT/bin/vi
 
-install -s elvis       $RPM_BUILD_ROOT%{_bindir}
-install -s elvis.static        $RPM_BUILD_ROOT/bin/vi
-install -s ref         $RPM_BUILD_ROOT%{_bindir}/
-install lib/ref.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}/man*/* \
-       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)
 %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