[parallel/f17] Update to new version and fix of bug 797823

[Golo Fuchert]

commit 89c9a66549dc9e0bfcbc1e4c0f8d0e972f306ebc
Author: golfu <packages at golotop.de>
Date:   Wed Mar 21 23:45:17 2012 +0100

    Update to new version and fix of bug 797823

 .gitignore    |    2 +-
 parallel.spec |   14 +++++++++-----
 sources       |    2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d5ff97a..2267c18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/parallel-20110722.tar.bz2
+/parallel-20120222.tar.bz2
diff --git a/parallel.spec b/parallel.spec
index 6c8aba6..534258d 100644
--- a/parallel.spec
+++ b/parallel.spec
@@ -1,7 +1,7 @@
 Summary:	Shell tool for executing jobs in parallel
 Name:		parallel
-Version:	20110722
-Release:	4%{?dist}
+Version:	20120222
+Release:	1%{?dist}
 License:	GPLv3+
 Group:		Applications/Productivity
 URL:		http://www.gnu.org/software/parallel/
@@ -48,6 +48,8 @@ make %{?_smp_mflags}
 make install DESTDIR=%{buildroot}
 
 find %{buildroot} -iname "*.html" -delete
+find %{buildroot} -iname "*.texi" -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,14 +65,16 @@ 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
+%doc src/niceload.html src/*.texi
 
 %changelog
+* Wed Mar 21 2012 Golo Fuchert <packages at golotop.de> - 20120222-1
+- Updated to newest version 20120222
+- renamed manpage sql to parallel-sql (naming conflict, bug 797823)
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20110722-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
 * Fri Sep 09 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
diff --git a/sources b/sources
index 307e757..f0c8cec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fddfaad6e944e7d6609bf110f9a562cc  parallel-20110722.tar.bz2
+31f211087c7f1c7b99092f6bccaa65ed  parallel-20120222.tar.bz2