From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sun, 22 Feb 2004 00:44:25 +0000 (+0000)
Subject: - updated to 2.2_0 release (2.2i was prerelease before 2.2)
X-Git-Tag: auto/ac/elvis-2_2_0-1~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Felvis.git;a=commitdiff_plain;h=01a6c9943fc8f106ed05d0ac91ae679b305dffca

- updated to 2.2_0 release (2.2i was prerelease before 2.2)
- fixed static build (LDFLAGS are not used)

Changed files:
    elvis.spec -> 1.43
---

diff --git a/elvis.spec b/elvis.spec
index a9d3c97..1d4f478 100644
--- a/elvis.spec
+++ b/elvis.spec
@@ -1,22 +1,21 @@
 Summary:	Elvis is a clone of vi/ex
 Summary(pl):	Elvis jest klonem edytora vi
 Name:		elvis
-Version:	2.2i
+Version:	2.2_0
 Release:	1
-License:	Artistic (see LICENSE)
+Epoch:		1
+License:	Artistic (see LICENSE.html)
 Group:		Applications/Editors
 Source0:	ftp://ftp.cs.pdx.edu/pub/elvis/%{name}-%{version}.tar.gz
-# Source0-md5:	dd53b90614686692d68d27e0223be770
+# Source0-md5:	6831b8df3e4a530395e66c2889783752
 URL:		http://elvis.vi-editor.org/
-BuildRequires:	ORBit-devel
 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.
@@ -47,48 +46,48 @@ kt
 
 %build
 CC="%{__cc} %{rpmcflags}"; export CC
-LDFLAGS="-static %{rpmldflags}"
 %configure \
 	--without-x \
 	--datadir=%{_datadir}/elvis
 
 %{__make} \
-	LIBS="-ltinfo"
+	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"
+	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/themes}
+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.html LICENSE.html
-install	lib/*.* $RPM_BUILD_ROOT%{_libdir}/elvis
-install lib/themes/* $RPM_BUILD_ROOT%{_libdir}/elvis/themes
+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
+
+mv -f doc/license.html LICENSE.html
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc LICENSE.html BUGS 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)