From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Sat, 5 Dec 2015 21:39:52 +0000 (+0100)
Subject: - up to 1.4.0
X-Git-Tag: auto/th/bvi-1.4.0-1~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fbvi.git;a=commitdiff_plain;h=13fa623395526b7a005d899b5c405920bd0c02aa

- up to 1.4.0
---

diff --git a/bvi-paths.patch b/bvi-paths.patch
deleted file mode 100644
index d72032a..0000000
--- a/bvi-paths.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -burN bvi-1.3.2.orig/Makefile.in bvi-1.3.2/Makefile.in
---- bvi-1.3.2.orig/Makefile.in	2004-02-15 00:17:56.715259832 +0100
-+++ bvi-1.3.2/Makefile.in	2004-02-15 01:07:21.133599744 +0100
-@@ -26,6 +26,7 @@
- bindir = $(DESTDIR)@bindir@
- mandir = $(DESTDIR)@mandir@
- libdir = $(DESTDIR)@libdir@
-+datadir = $(DESTDIR)@datadir@
- 
- man1dir = $(mandir)/man1
- 
-@@ -58,7 +59,7 @@
- 	$(CC) $(CFLAGS) $(DEFS) -c $<
- 
- bmore.o: bmore.c
--	$(CC) $(CFLAGS) $(DEFS) -DHELPFILE=\"$(libdir)/bmore.help\" -c $<
-+	$(CC) $(CFLAGS) $(DEFS) -DHELPFILE=\"$(datadir)/bvi/bmore.help\" -c $<
- 
- 
- install: all installdirs
-@@ -66,14 +67,14 @@
- 	@$(INSTALL_DATA) bvi.1 bmore.1 $(man1dir)
- 	@$(INSTALL_PROGRAM) -s bvi $(bindir)
- 	@$(INSTALL_PROGRAM) -s bmore $(bindir)
--	@$(INSTALL_DATA) bmore.help $(libdir)
-+	@$(INSTALL_DATA) bmore.help $(datadir)/bvi
- 	@if [ -f $(bindir)/bview ]; then rm $(bindir)/bview; fi
- 	@if [ -f $(bindir)/bvedit ]; then rm $(bindir)/bvedit; fi
- 	@ln $(bindir)/bvi $(bindir)/bview
- 	@ln $(bindir)/bvi $(bindir)/bvedit
- 
- installdirs:
--	$(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(libdir) $(man1dir)
-+	$(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(datadir)/bvi $(man1dir)
- 
- uninstall:
- 	@echo "Uninstalling bvi"
diff --git a/bvi.spec b/bvi.spec
index b70639f..27271a2 100644
--- a/bvi.spec
+++ b/bvi.spec
@@ -1,14 +1,13 @@
 Summary:	Binary vi
 Summary(pl.UTF-8):	Binarny vi
 Name:		bvi
-Version:	1.3.2
-Release:	2
+Version:	1.4.0
+Release:	1
 License:	GPL
 Group:		Applications/Editors
 Source0:	http://dl.sourceforge.net/bvi/%{name}-%{version}.src.tar.gz
-# Source0-md5:	4257305ffb27177a6d5208b2df4ca92d
+# Source0-md5:	aa83eb8b2b6b0bb6cdd8e6beef12b775
 Patch0:		%{name}-home_etc.patch
-Patch1:		%{name}-paths.patch
 URL:		http://bvi.sourceforge.net/
 BuildRequires:	automake
 BuildRequires:	ncurses-devel
@@ -25,7 +24,6 @@ edytorze vi.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 cp -f /usr/share/automake/config.sub .
@@ -45,7 +43,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README CHANGES CREDITS html/*
+%doc README CHANGES CREDITS
 %attr(755,root,root) %{_bindir}/*
 %{_datadir}/%{name}
 %{_mandir}/man1/*