[parallel/f16] Fixed Bug 797823

[Golo Fuchert]

commit 21e8e68b6b6f61f34bd4fd8f3dd19835147fb51b
Author: golfu <packages at golotop.de>
Date:   Thu Mar 22 00:04:41 2012 +0100

    Fixed Bug 797823

 parallel.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/parallel.spec b/parallel.spec
index 8fb29d4..5c35aa5 100644
--- a/parallel.spec
+++ b/parallel.spec
@@ -1,7 +1,7 @@
 Summary:	Shell tool for executing jobs in parallel
 Name:		parallel
 Version:	20110722
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	GPLv3+
 Group:		Applications/Productivity
 URL:		http://www.gnu.org/software/parallel/
@@ -48,6 +48,7 @@ make %{?_smp_mflags}
 make install DESTDIR=%{buildroot}
 
 find %{buildroot} -iname "*.html" -delete
+mv %{buildroot}%{_mandir}/man1/sql.1 %{buildroot}%{_mandir}/man1/parallel-sql.1
 
 mkdir -m755 -p %{buildroot}%{_sysconfdir}/parallel
 install -pD -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/parallel/config
@@ -63,11 +64,13 @@ install -pD -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/parallel/config
 %{_mandir}/man1/niceload.1.*
 %{_mandir}/man1/parallel.1.*
 %{_mandir}/man1/sem.1.*
-%{_mandir}/man1/sql.1.*
+%{_mandir}/man1/parallel-sql.1.*
 %doc README NEWS COPYING src/parallel.html src/sem.html src/sql.html 
 %doc src/niceload.html
 
 %changelog
+* Wed Mar 21 2012 Golo Fuchert <packages at golotop.de> - 20110722-4
+- renamed manpage sql to parallel-sql (naming conflict, bug 797823)
 * Wed Oct 26 2011 Golo Fuchert <packages at golotop.de> - 20110722-3
 - Added niceload.html to doc
 * Fri Sep 09 2011 Golo Fuchert <packages at golotop.de> - 20110722-2