[tcllib/f19] Resolve two more conflicts

[Dmitrij S. Kryzhevich]

commit c4754794cefc71aee949d7820bac6aa0a726c5f9
Author: Dmitrij S. Kryzhevich <krege at land.ru>
Date:   Mon Feb 24 12:43:44 2014 +0700

    Resolve two more conflicts

 tcllib.spec |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/tcllib.spec b/tcllib.spec
index c821ce9..2a7944a 100644
--- a/tcllib.spec
+++ b/tcllib.spec
@@ -4,7 +4,7 @@
 Summary:    The standard Tcl library
 Name:       tcllib
 Version:    1.15
-Release:    2%{?dist}
+Release:    3%{?dist}
 License:    BSD
 Group:      Development/Libraries
 Source:     http://downloads.sourceforge.net/tcllib/tcllib-1.15.tar.gz
@@ -48,8 +48,11 @@ done
 popd
 
 # man conflict with main tcl package (which have higher priority)
-mv %{buildroot}%_mandir/mann/string.n %{buildroot}%_mandir/mann/string.tcllib.n
-mv %{buildroot}%_mandir/mann/variable.n %{buildroot}%_mandir/mann/variable1.tcllib.n
+# and memchan
+for n in string variable fifo fifo2
+do
+    mv %{buildroot}%_mandir/mann/$n.n %{buildroot}%_mandir/mann/$n.tcllib.n
+done
 
 # Clean up rpmlint warnings
 find %{buildroot}/%{_datadir} -name \*.tcl -exec chmod 0644 {} \;
@@ -67,6 +70,9 @@ find %{buildroot}/%{_datadir} -name \*.tcl -exec chmod 0644 {} \;
 %{_bindir}/tcldocstrip
 
 %changelog
+* Mon Feb 24 2014 Dmitrij S. Kryzhevich <krege at land.ru> - 1.15-3
+- Add two more man files to conflict-list.
+
 * Fri Feb 21 2014 Dmitrij S. Kryzhevich <krege at land.ru> - 1.15-2
 - Fix man/mann file conflict with tcl package.