[multitail] Rebase to new upstream release - 6.0

[kashyap chamarthy]

commit 8329073127fa3a454c2e4f1c5fe04023967b5a90
Author: Kashyap Chamarthy <kashyapc at fedoraproject.org>
Date:   Mon Dec 16 11:37:31 2013 +0100

    Rebase to new upstream release - 6.0

 .gitignore                |    1 +
 Unversioned-doc-dir.patch |   20 ++++++++++++++++++++
 multitail.spec            |   31 ++++++++++++++++++++++---------
 sources                   |    1 +
 4 files changed, 44 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 787f7e6..7d38c4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ multitail-5.2.6.tgz
 /multitail-5.2.8.tgz
 /multitail-5.2.12.tgz
 /multitail-5.2.13.tgz
+/multitail-6.0.tgz
diff --git a/Unversioned-doc-dir.patch b/Unversioned-doc-dir.patch
new file mode 100644
index 0000000..ef81fab
--- /dev/null
+++ b/Unversioned-doc-dir.patch
@@ -0,0 +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)
+ 	#
+ 	### 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)
+ 
+ clean:
+ 	rm -f $(OBJS) multitail core gmon.out *.da ccmultitail
diff --git a/multitail.spec b/multitail.spec
index d39c956..dd5c6b8 100644
--- a/multitail.spec
+++ b/multitail.spec
@@ -1,5 +1,5 @@
 Name:		multitail
-Version:	5.2.13
+Version:	6.0
 Release:	1%{?dist}
 Summary:	View one or multiple files like tail but with multiple windows
 
@@ -9,12 +9,13 @@ Group:		Applications/Text
 License:	GPL+
 URL:		http://www.vanheusden.com/multitail/
 Source:		http://www.vanheusden.com/multitail/multitail-%{version}.tgz
-
-## Setup/build bits
-BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Patch0:     Unversioned-doc-dir.patch
 
 BuildRequires:	ncurses-devel
 
+# For unversioned doc dir
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 %description
 MultiTail lets you view one or multiple files like the original tail
 program. The difference is that it creates multiple windows on your
@@ -34,6 +35,7 @@ external software, MultiTail can mimic the functionality of tools like
 
 %prep
 %setup -q -n multitail-%{version}
+%patch0  -p1
 
 %build
 CFLAGS="%{optflags}" make %{?_smp_mflags}
@@ -51,10 +53,15 @@ chmod 644 convert-*.pl
 
 %install
 rm -rf %{buildroot}
+mkdir -p %{buildroot}/%{_pkgdocdir}
 install -d -m0755 %{buildroot}%{_bindir} \
 	%{buildroot}%{_mandir}/man1/ \
-	%{buildroot}%{_sysconfdir}
-make install DESTDIR=%{buildroot}
+	%{buildroot}%{_sysconfdir} \
+    %{buildroot}%{_pkgdocdir}
+make  DESTDIR=%{buildroot} \
+    DOCDIR=%{buildroot}%{_pkgdocdir} \
+    install
+
 
 # move the configuration in the right place
 mv %{buildroot}%{_sysconfdir}/multitail.conf.new \
@@ -63,11 +70,8 @@ mv %{buildroot}%{_sysconfdir}/multitail.conf.new \
 # remove the examples (installed as docs)
 rm %{buildroot}%{_sysconfdir}/multitail/colors-example.*
 
-%clean
-rm -rf %{buildroot}
 
 %files
-%defattr(-, root, root, -)
 %doc manual*.html Changes license.txt readme.txt colors-example.*
 %config(noreplace) %{_sysconfdir}/multitail.conf
 %{_sysconfdir}/multitail/
@@ -75,6 +79,15 @@ rm -rf %{buildroot}
 %{_mandir}/man1/multitail.1*
 
 %changelog
+
+* Mon Dec 16 2013 Kashyap Chamarthy <kashyapc at fedoraproject.org> - 6.0-1
+- New upstream release 6.0
+  Resolves: rhbz:1035637
+- Add a patch to use unversioned doc dirs. Ref: http://fedoraproject.org/wiki/Changes/UnversionedDocdirs
+- Remove BuildRoot tag.
+- Remove %clean section and remove the %defattr section from %files
+  section.
+
 * Fri Jul 26 2013 Susi Lehtola <jussilehtola at fedoraproject.org> - 5.2.13-1
 - Keep the conversion scripts in %%{_sysconfdir}, as they may be
   called by the configuration (see multitail.conf).
diff --git a/sources b/sources
index 7dbdda5..9839f4c 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 71a774b6d6bb430672c8a9252baac6e6  multitail-5.2.13.tgz
+fb8efc547d389257021885fe5402255c  multitail-6.0.tgz