X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=elvis.spec;h=c96bc1d0379096363e265ef5e0d7a49130586c18;hb=7dceb7ac98f1ba71aab01e6d20eae72bd0f53daf;hp=cca06301265c346ba8e1a70b3e648a339965cfc6;hpb=da9cb440a9dd9db9eea571bc15a6910992b8b5ac;p=packages%2Felvis.git

diff --git a/elvis.spec b/elvis.spec
index cca0630..c96bc1d 100644
--- a/elvis.spec
+++ b/elvis.spec
@@ -1,87 +1,91 @@
 Summary:	Elvis is a clone of vi/ex
 Summary(pl):	Elvis jest klonem edytora vi
 Name:		elvis
-Version:	2.1
+Version:	2.2h
 Release:	1
-Copyright:	Artistic License
+License:	Artistic (see LICENSE)
 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:	ftp://ftp.cs.pdx.edu/pub/elvis/unreleased/%{name}-%{version}.tar.gz
+BuildRequires:	ORBit-devel
+BuildRequires:	XFree86-devel
+BuildRequires:	ncurses-devel >= 5.0
+BuildRequires:	ncurses-static
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Obsoletes:	elvis-X11
+
+%define		_libdir		%{_datadir}
 
 %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
+LDFLAGS="-static %{rpmldflags}"
+%configure \
 	--without-x \
-	linux
-make LIBS="-static -lncurses"
-mv elvis elvis.static
+	--datadir=%{_datadir}/elvis
+	
+%{__make} LIBS="-ltinfo"
+mv -f elvis elvis.static
 
-make clean
+%{__make} clean
 
-CC="cc $RPM_OPT_FLAGS" LDFLAGS="-s" \
-./configure \
-	--prefix=/usr \
+LDFLAGS="%{rpmldflags}"
+%configure \
 	--with-x \
-	linux
-make LIBS=" -lX11 -lncurses"
+	--datadir=%{_datadir}/elvis
+
+%{__make} LIBS="-ltinfo -lX11 -L/usr/X11R6/lib"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/usr/{bin,man/man1,lib/elvis}
-
-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/
+install -d $RPM_BUILD_ROOT/{bin,%{_bindir},%{_mandir}/man1,%{_datadir}/elvis/themes}
 
-rm -f	lib/*man
-install	lib/*		$RPM_BUILD_ROOT/usr/lib/elvis
+install elvis ref $RPM_BUILD_ROOT%{_bindir}
+install elvis.static $RPM_BUILD_ROOT/bin/vi
+install lib/*.man $RPM_BUILD_ROOT%{_mandir}/man1
 
-gzip -9nf $RPM_BUILD_ROOT/usr/man/man*/* \
-	lib/license BUGS
+rm -f	lib/*.man
+mv -f lib/license LICENSE
+install	lib/*.* $RPM_BUILD_ROOT%{_libdir}/elvis
+install lib/themes/* $RPM_BUILD_ROOT%{_libdir}/elvis/themes
 
 %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 LICENSE BUGS README.html
+%attr(755,root,root) %{_bindir}/elvis
+%attr(755,root,root) %{_bindir}/ref
+%{_mandir}/man1/*
+%{_libdir}/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