SPECS: nvi.spec - 1.81.5

aredridel aredridel at pld-linux.org
Thu Apr 5 02:10:41 CEST 2007


Author: aredridel                    Date: Thu Apr  5 00:10:41 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 1.81.5

---- Files affected:
SPECS:
   nvi.spec (1.37 -> 1.38) 

---- Diffs:

================================================================
Index: SPECS/nvi.spec
diff -u SPECS/nvi.spec:1.37 SPECS/nvi.spec:1.38
--- SPECS/nvi.spec:1.37	Tue Feb 13 08:16:50 2007
+++ SPECS/nvi.spec	Thu Apr  5 02:10:36 2007
@@ -11,17 +11,23 @@
 Summary(de.UTF-8):	Klon des POSIX konformen Editors 'vi'
 Summary(pl.UTF-8):	Klon edytora POSIX-owego 'vi' i 'ex'
 Name:		nvi
-Version:	1.79
-Release:	8
+Version:	1.81.5
+Release:	1
 License:	BSD
 Group:		Applications/System
-Source0:	ftp://www.sleepycat.com/pub/%{name}-%{version}.tar.gz
-# Source0-md5:	765e2153f5fc4f21793f2edc2647305a
-Patch0:		%{name}.patch
-Patch10:	%{name}-gtags.patch
+Source0:	http://www.kotnet.org/~skimo/nvi/devel/%{name}-%{version}.tar.bz2
+# Source0-md5:	82262d08803b364033dd7ab38190305a
+Patch1:	%{name}-header.patch
+Patch2:	%{name}-tcsetattr.patch
+Patch3:	%{name}-gcc4.patch
+Patch4:	%{name}-autoconf.patch
+Patch5:	%{name}-db4.patch
 URL:		http://www.bostic.com/vi/
+BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	libtool
 BuildRequires:	ncurses-devel >= 5.0
+BuildRequires:	db-static >= 4.0
 Provides:	vi
 Obsoletes:	elvis-static
 Obsoletes:	vim-static
@@ -42,46 +48,41 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch10 -p1
-
-# these were deleted by previous version of patch
-rm -f docs/USD.doc/{edit/edittut.ps,exref/exref.ps,exref/summary.ps} \
-	docs/USD.doc/vi.man/{vi.0,vi.0.ps} \
-	docs/USD.doc/vi.ref/{index.so,vi.ref.ps,vi.ref.txt} \
-	docs/USD.doc/vitut/{summary.ps,viapwh.ps,vitut.ps}
+%patch1 -p1
+%patch2 -p0
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
-cd build
+cd dist
+cp ../clib/*.c .
 cp -f /usr/share/automake/config.* .
-CFLAGS="%{rpmcflags} -I/usr/include/ncurses"
-LDFLAGS="-lncurses %{rpmldflags}"
-%configure2_13 \
-	--disable-curses \
-	--disable-perl
-%{__make}
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
+%configure \
+	--enable-widechar
+%{__make} \
+	LDFLAGS=-all-static
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_mandir}/man1,%{_docdir}/%{name}-%{version},%{_bindir},%{_sbindir}}
 
-install docs/USD.doc/vi.man/vi.1 $RPM_BUILD_ROOT%{_mandir}/man1/vi.1
-install build/nvi $RPM_BUILD_ROOT%{_bindir}/vi
-
-ln -sf vi $RPM_BUILD_ROOT%{_bindir}/ex
-ln -sf vi $RPM_BUILD_ROOT%{_bindir}/view
-
-echo ".so vi.1" > $RPM_BUILD_ROOT%{_mandir}/man1/ex.1
-echo ".so vi.1" > $RPM_BUILD_ROOT%{_mandir}/man1/view.1
-
-install build/recover $RPM_BUILD_ROOT%{_sbindir}/recover
+cd dist
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
+install recover $RPM_BUILD_ROOT%{_sbindir}
+cd ..
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc FAQ LICENSE LAYOUT README
+%doc LICENSE README
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/recover
 %{_mandir}/man1/*
@@ -92,6 +93,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38  2007/04/05 00:10:36  aredridel
+- 1.81.5
+
 Revision 1.37  2007/02/13 07:16:50  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/nvi.spec?r1=1.37&r2=1.38&f=u



More information about the pld-cvs-commit mailing list