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

diff --git a/elvis.spec b/elvis.spec
index 7adc1f8..6138c8a 100644
--- a/elvis.spec
+++ b/elvis.spec
@@ -1,92 +1,96 @@
 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.2a
-Release:	4
-Copyright:	Artistic License
+Version:	2.2_0
+Release:	2
+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:	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:	XFree86-devel
-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
-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(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
-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"; 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 clean
+%{__make} \
+	LIBS="%{rpmldflags} -static -ltinfo"
+
+%{__mv} 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 -lXft -lXpm -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} 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)