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

diff --git a/elvis.spec b/elvis.spec
index 1f956e6..c96bc1d 100644
--- a/elvis.spec
+++ b/elvis.spec
@@ -1,88 +1,91 @@
 Summary:	Elvis is a clone of vi/ex
 Summary(pl):	Elvis jest klonem edytora vi
 Name:		elvis
-Version:	2.1
-Release:	3
-Copyright:	Artistic License
+Version:	2.2h
+Release:	1
+License:	Artistic (see LICENSE)
 Group:		Applications/Editors
-Group(pl):	Aplikacje/Edytory
-Source:		ftp://ftp.cs.pdx.edu/pub/elvis/%{name}-%{version}.tar.gz
+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
-BuildRequires:	XFree86-devel
-BuildRoot:	/tmp/%{name}-%{version}-root
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	elvis-X11
 
-%define		_libdir %{_datadir}
+%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"; export CC
-LDFLAGS="-static -s"; export LDFLAGS
+CC="%{__cc} %{rpmcflags}"; export CC
+LDFLAGS="-static %{rpmldflags}"
 %configure \
-	--without-x
+	--without-x \
+	--datadir=%{_datadir}/elvis
 	
-make LIBS="-ltinfo"
-mv elvis elvis.static
+%{__make} LIBS="-ltinfo"
+mv -f elvis elvis.static
 
-make clean
+%{__make} clean
 
-LDFLAGS="-s";export LDFLAGS
+LDFLAGS="%{rpmldflags}"
 %configure \
-	--with-x
+	--with-x \
+	--datadir=%{_datadir}/elvis
 
-make LIBS="-ltinfo -lX11 -L/usr/X11R6/lib"
+%{__make} LIBS="-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/themes}
 
-install -s elvis ref $RPM_BUILD_ROOT%{_bindir}
-install -s elvis.static $RPM_BUILD_ROOT/bin/vi
-install lib/ref.man $RPM_BUILD_ROOT%{_mandir}/man1
+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 lib/license .
-install	lib/* $RPM_BUILD_ROOT%{_libdir}/elvis
-
-gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man*/* \
-	license BUGS
+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 {license,BUGS}.gz README.html
+%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