- updated URLs, use __mv macro

[packages/elvis.git] / elvis.spec

diff --git a/elvis.spec b/elvis.spec
index 1a9718dde83c919d3ad72f69df3b5d8e4a366e1d..6138c8a83f4772648b46efbada732f64e2998a18 100644 (file)
--- a/elvis.spec
+++ b/elvis.spec
@@ -6,15 +6,17 @@ Release:      2
 Epoch:         1
 License:       Artistic (see LICENSE.html)
 Group:         Applications/Editors
 Epoch:         1
 License:       Artistic (see LICENSE.html)
 Group:         Applications/Editors

-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
 # Source0-md5: 6831b8df3e4a530395e66c2889783752

-URL:           http://elvis.vi-editor.org/
-BuildRequires: xorg-lib-libX11-devel
+URL:           http://elvis.the-little-red-haired-girl.org/

 BuildRequires: glibc-static
 BuildRequires: ncurses-devel >= 5.0
 BuildRequires: ncurses-static
 BuildRequires: glibc-static
 BuildRequires: ncurses-devel >= 5.0
 BuildRequires: ncurses-static

-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
 Obsoletes:     elvis-X11

+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)

 
 %description
 Elvis is one of the most popular Vi clones. Its swift, well
 
 %description
 Elvis is one of the most popular Vi clones. Its swift, well


@@ -34,7 +36,7 @@ Obsoletes:    vim-static
 Obsoletes:     nvi
 
 %description static
 Obsoletes:     nvi
 
 %description static

-The classic unix /bin/vi - small, statically linked editor which is
+The classic Unix /bin/vi - small, statically linked editor which is

 useful as a rescue tool.
 
 %description static -l pl.UTF-8
 useful as a rescue tool.
 
 %description static -l pl.UTF-8


@@ -52,7 +54,8 @@ CC="%{__cc} %{rpmcflags}"; export CC
 
 %{__make} \
        LIBS="%{rpmldflags} -static -ltinfo"
 
 %{__make} \
        LIBS="%{rpmldflags} -static -ltinfo"

-mv -f elvis elvis.static
+
+%{__mv} elvis elvis.static

 
 %{__make} clean
 
 
 %{__make} clean
 


@@ -76,7 +79,7 @@ done
 
 cp -rf data/* $RPM_BUILD_ROOT%{_datadir}/elvis
 
 
 cp -rf data/* $RPM_BUILD_ROOT%{_datadir}/elvis
 

-mv -f doc/license.html LICENSE.html
+%{__mv} doc/license.html LICENSE.html

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT