Summary: Elvis is a clone of vi/ex
-Summary(pl): Elvis jest klonem edytora vi
+Summary(pl.UTF-8): Elvis jest klonem edytora vi
Name: elvis
-Version: 2.2i
-Release: 1
-License: Artistic (see LICENSE)
+Version: 2.2_0
+Release: 2
+Epoch: 1
+License: Artistic (see LICENSE.html)
Group: Applications/Editors
-Source0: ftp://ftp.cs.pdx.edu/pub/elvis/%{name}-%{version}.tar.gz
-# Source0-md5: dd53b90614686692d68d27e0223be770
-URL: http://elvis.vi-editor.org/
-BuildRequires: ORBit-devel
-BuildRequires: XFree86-devel
+Source0: http://www.the-little-red-haired-girl.org/pub/elvis/%{name}-%{version}.tar.gz
+# Source0-md5: 6831b8df3e4a530395e66c2889783752
+URL: http://elvis.the-little-red-haired-girl.org/
+BuildRequires: glibc-static
BuildRequires: ncurses-devel >= 5.0
BuildRequires: ncurses-static
-BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xorg-lib-libXft-devel
+BuildRequires: xorg-lib-libXpm-devel
Obsoletes: elvis-X11
-
-%define _libdir %{_datadir}
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
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ê.
+%description -l pl.UTF-8
+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
+Summary(pl.UTF-8): elvis skompilowany statycznie
Group: Applications/Editors
Provides: vi
Obsoletes: vi
Obsoletes: nvi
%description static
-The classic unix /bin/vi - small, statically linked editor which is
+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.
+%description static -l pl.UTF-8
+Klasyczny uniksowy /bin/vi - mały, skompilowany statycznie edytor,
+który przydaje się przy awarii systemu.
%prep
%setup -q
%build
CC="%{__cc} %{rpmcflags}"; export CC
-LDFLAGS="-static %{rpmldflags}"
%configure \
--without-x \
--datadir=%{_datadir}/elvis
%{__make} \
- LIBS="-ltinfo"
-mv -f elvis elvis.static
+ LIBS="%{rpmldflags} -static -ltinfo"
+
+%{__mv} elvis elvis.static
%{__make} clean
-LDFLAGS="%{rpmldflags}"
%configure \
--with-x \
--datadir=%{_datadir}/elvis
%{__make} \
- LIBS="-ltinfo -lX11 -L/usr/X11R6/lib"
+ LIBS="%{rpmldflags} -ltinfo -lXft -lXpm -lX11 -L/usr/X11R6/%{_lib}"
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/bin,%{_bindir},%{_mandir}/man1,%{_datadir}/elvis/themes}
+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 lib/*.man $RPM_BUILD_ROOT%{_mandir}/man1
-rm -f lib/*.man
-mv -f lib/license.html LICENSE.html
-install lib/*.* $RPM_BUILD_ROOT%{_libdir}/elvis
-install lib/themes/* $RPM_BUILD_ROOT%{_libdir}/elvis/themes
+for f in doc/{elv*,ref}.man ; do
+ install $f $RPM_BUILD_ROOT%{_mandir}/man1/`basename $f .man`.1
+done
+
+cp -rf data/* $RPM_BUILD_ROOT%{_datadir}/elvis
+
+%{__mv} doc/license.html LICENSE.html
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc LICENSE.html BUGS 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)