X-Git-Url: http://git.pld-linux.org/?p=packages%2Felvis.git;a=blobdiff_plain;f=elvis.spec;h=ed447ab6ad27271b529caa4dd528565a562de4b1;hp=6bfb9857ad73b348032f6bc9a59edd847d864e12;hb=00563581b42d332fe96a26cb8c13570bac8a7028;hpb=f6c731a5c0347db353f124e895a79b301e483227

diff --git a/elvis.spec b/elvis.spec
index 6bfb985..ed447ab 100644
--- a/elvis.spec
+++ b/elvis.spec
@@ -1,23 +1,21 @@
 Summary:	Elvis is a clone of vi/ex
 Summary(pl):	Elvis jest klonem edytora vi
 Name:		elvis
-Version:	2.2f
+Version:	2.2_0
 Release:	1
-License:	Artistic License
+Epoch:		1
+License:	Artistic (see LICENSE.html)
 Group:		Applications/Editors
-Group(de):	Applikationen/Editors
-Group(pl):	Aplikacje/Edytory
-Group(pt):	Aplicações/Editores
-Source0:	ftp://ftp.cs.pdx.edu/pub/elvis/unreleased/%{name}-%{version}.tar.gz
-BuildRequires:	ORBit-devel
+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
 
-%define		_libdir		%{_datadir}
-
 %description
 Elvis is one of the most popular Vi clones. Its swift, well
 documented and has many features.
@@ -30,14 +28,13 @@ posiada bogate mo
 Summary:	Static elvis
 Summary(pl):	elvis skompilowany statycznie
 Group:		Applications/Editors
-Group(de):	Applikationen/Editors
-Group(pl):	Aplikacje/Edytory
-Group(pt):	Aplicações/Editores
 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
@@ -49,47 +46,48 @@ kt
 
 %build
 CC="%{__cc} %{rpmcflags}"; export CC
-LDFLAGS="-static %{rpmldflags}"
 %configure \
 	--without-x \
 	--datadir=%{_datadir}/elvis
-	
-%{__make} LIBS="-ltinfo"
+
+%{__make} \
+	LIBS="%{rpmldflags} -static -ltinfo"
 mv -f elvis elvis.static
 
 %{__make} clean
 
-LDFLAGS="%{rpmldflags}"
 %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 lib/*.man $RPM_BUILD_ROOT%{_mandir}/man1
 
-rm -f	lib/*.man
-mv -f lib/license .
-install	lib/* $RPM_BUILD_ROOT%{_libdir}/elvis
+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
 
-gzip -9nf license BUGS
+mv -f doc/license.html LICENSE.html
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc *.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)