From 0f29799f389b8bb306bd260a61b0c169f8905066 Mon Sep 17 00:00:00 2001
From: Jon Stanley <jonstanley@gmail.com>
Date: Dec 24 2015 02:03:34 +0000
Subject: Update to 6.4.2


---

diff --git a/.gitignore b/.gitignore
index e5bbfce..826a5e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ multitail-5.2.6.tgz
 /multitail-5.2.13.tgz
 /multitail-6.0.tgz
 /multitail-6.2.1.tgz
+/multitail-6.4.2.tgz
diff --git a/Unversioned-doc-dir.patch b/Unversioned-doc-dir.patch
index ef81fab..bdd85b4 100644
--- a/Unversioned-doc-dir.patch
+++ b/Unversioned-doc-dir.patch
@@ -1,20 +1,20 @@
-diff -urN multitail-6.0-old/Makefile multitail-6.0/Makefile
---- multitail-6.0-old/Makefile	2013-11-27 02:03:35.000000000 +0530
-+++ multitail-6.0/Makefile	2013-12-16 14:22:37.804810248 +0530
-@@ -27,8 +27,6 @@
- install: multitail
- 	cp multitail $(DESTDIR)/usr/bin
- 	cp multitail.1 $(DESTDIR)/usr/share/man/man1/multitail.1
--	mkdir -p $(DESTDIR)/usr/share/doc/multitail-$(VERSION)
--	cp *.txt INSTALL manual*.html $(DESTDIR)/usr/share/doc/multitail-$(VERSION)
+diff -up multitail-6.4.2/Makefile.orig multitail-6.4.2/Makefile
+--- multitail-6.4.2/Makefile.orig	2015-12-23 22:58:28.000000000 -0500
++++ multitail-6.4.2/Makefile	2015-12-23 22:58:41.000000000 -0500
+@@ -30,8 +30,6 @@ install: multitail
+ 	cp multitail $(DESTDIR)$(PREFIX)/bin
+ 	mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1
+ 	cp multitail.1 $(DESTDIR)$(PREFIX)/share/man/man1/multitail.1
+-	mkdir -p $(DESTDIR)$(PREFIX)/share/doc/multitail-$(VERSION)
+-	cp *.txt INSTALL manual*.html $(DESTDIR)$(PREFIX)/share/doc/multitail-$(VERSION)
  	#
  	### COPIED multitail.conf.new, YOU NEED TO REPLACE THE multitail.conf
  	### YOURSELF WITH THE NEW FILE
-@@ -53,7 +51,6 @@
- 	rm -f $(DESTDIR)/usr/bin/multitail
- 	rm -f $(DESTDIR)/usr/share/man/man1/multitail.1.gz
- 	rm -f $(CONFIG_FILE)
--	rm -rf $(DESTDIR)/usr/share/doc/multitail-$(VERSION)
+@@ -56,7 +54,6 @@ uninstall: clean
+ 	rm -f $(DESTDIR)$(PREFIX)/bin/multitail
+ 	rm -f $(DESTDIR)$(PREFIX)/share/man/man1/multitail.1.gz
+ #	rm -f $(CONFIG_FILE)
+-	rm -rf $(DESTDIR)$(PREFIX)/share/doc/multitail-$(VERSION)
  
  clean:
  	rm -f $(OBJS) multitail core gmon.out *.da ccmultitail
diff --git a/multitail.spec b/multitail.spec
index 59db9ba..0719a50 100644
--- a/multitail.spec
+++ b/multitail.spec
@@ -1,6 +1,6 @@
 Name:		multitail
-Version:	6.2.1
-Release:	4%{?dist}
+Version:	6.4.2
+Release:	1%{?dist}
 Summary:	View one or multiple files like tail but with multiple windows
 
 Group:		Applications/Text
@@ -40,15 +40,15 @@ external software, MultiTail can mimic the functionality of tools like
 CFLAGS="%{optflags}" make %{?_smp_mflags}
 
 # Fix up doc encoding
-for f in Changes readme.txt; do
+for f in readme.txt; do
     iconv -f ISO88592 -t UTF8 < $f > $f.utf8 && \
     touch -r $f $f.utf8 && \
     mv $f.utf8 $f
 done
 
 # Fix up examples permissions
-chmod 644 colors-example.*
-chmod 644 convert-*.pl
+chmod 644 conversion-scripts/colors-example.*
+chmod 644 conversion-scripts/convert-*.pl
 
 %install
 rm -rf %{buildroot}
@@ -67,13 +67,16 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc manual*.html Changes license.txt readme.txt colors-example.*
+%doc manual*.html license.txt readme.txt conversion-scripts/colors-example.*
 %config(noreplace) %{_sysconfdir}/multitail.conf
 %{_sysconfdir}/multitail/
 %{_bindir}/multitail
 %{_mandir}/man1/multitail.1*
 
 %changelog
+* Wed Dec 23 2015 Jon Stanley <jonstanley@gmail.com> - 6.4.2-1
+- Update to 6.4.2
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.2.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index 7f99259..b2f764c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f83419bd2b90ae4227c5a3ce2f66b56d  multitail-6.2.1.tgz
+a0959f7b2385061080712afd8ae6e33d  multitail-6.4.2.tgz