X-Git-Url: http://git.pld-linux.org/?p=packages%2Felvis.git;a=blobdiff_plain;f=elvis.spec;h=43fcc8e0bcd064eff2221ccef3e8b54338af2272;hp=cca06301265c346ba8e1a70b3e648a339965cfc6;hb=HEAD;hpb=da9cb440a9dd9db9eea571bc15a6910992b8b5ac

diff --git a/elvis.spec b/elvis.spec
index cca0630..6138c8a 100644
--- a/elvis.spec
+++ b/elvis.spec
@@ -1,87 +1,97 @@
 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.1
-Release:	1
-Copyright:	Artistic License
+Version:	2.2_0
+Release:	2
+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
-BuildRoot:   	/tmp/%{name}-%{version}-root
+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
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-lib-libXft-devel
+BuildRequires:	xorg-lib-libXpm-devel
+Obsoletes:	elvis-X11
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %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ê.
+%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
-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.
+%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 $RPM_OPT_FLAGS" LDFLAGS="-static -s" \
-./configure \
-	--prefix=/usr \
+CC="%{__cc} %{rpmcflags}"; export CC
+%configure \
 	--without-x \
-	linux
-make LIBS="-static -lncurses"
-mv elvis elvis.static
+	--datadir=%{_datadir}/elvis
 
-make clean
+%{__make} \
+	LIBS="%{rpmldflags} -static -ltinfo"
 
-CC="cc $RPM_OPT_FLAGS" LDFLAGS="-s" \
-./configure \
-	--prefix=/usr \
+%{__mv} elvis elvis.static
+
+%{__make} clean
+
+%configure \
 	--with-x \
-	linux
-make LIBS=" -lX11 -lncurses"
+	--datadir=%{_datadir}/elvis
+
+%{__make} \
+	LIBS="%{rpmldflags} -ltinfo -lXft -lXpm -lX11 -L/usr/X11R6/%{_lib}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/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/usr/bin
-install -s elvis.static	$RPM_BUILD_ROOT/bin/vi
-install -s ref		$RPM_BUILD_ROOT/usr/bin/
+for f in doc/{elv*,ref}.man ; do
+	install $f $RPM_BUILD_ROOT%{_mandir}/man1/`basename $f .man`.1
+done
 
-rm -f	lib/*man
-install	lib/*		$RPM_BUILD_ROOT/usr/lib/elvis
+cp -rf data/* $RPM_BUILD_ROOT%{_datadir}/elvis
 
-gzip -9nf $RPM_BUILD_ROOT/usr/man/man*/* \
-	lib/license BUGS
+%{__mv} doc/license.html LICENSE.html
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc {lib/license,BUGS}.gz README.html
-%attr(755,root,root) /usr/bin/elvis
-%attr(755,root,root) /usr/bin/ref
-%attr(755,root,root) /bin/vi
-/usr/lib/elvis
+%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/*
+%{_datadir}/elvis
 
 %files static
+%defattr(644,root,root,755)
 %attr(755,root,root) /bin/vi
-
-%changelog
-* Tue Apr 27 1999 Micha³ Kuratczyk <kura@pld.org.pl>
-  [2.1-1]
-- built for PLD