From 98633b6805965bcb3368ee9ac38cf3fd51d0da4c Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Mon, 2 Jun 2008 18:37:08 +0000
Subject: [PATCH] - Version bump to 2.22.1. Closes Red Hat Bugzilla bug
 #444335. - Parallel build problems fixed by upstream.

---
 .cvsignore                 |  2 +-
 gengetopt-2.22-gcc43.patch | 11 -----------
 gengetopt.spec             | 13 ++++++-------
 sources                    |  2 +-
 4 files changed, 8 insertions(+), 20 deletions(-)
 delete mode 100644 gengetopt-2.22-gcc43.patch

diff --git a/.cvsignore b/.cvsignore
index 67300cc..cdfe5aa 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gengetopt-2.22.tar.gz
+gengetopt-2.22.1.tar.gz
diff --git a/gengetopt-2.22-gcc43.patch b/gengetopt-2.22-gcc43.patch
deleted file mode 100644
index 073ec56..0000000
--- a/gengetopt-2.22-gcc43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urNp gengetopt-2.22.orig/src/fileutils.cpp gengetopt-2.22/src/fileutils.cpp
---- gengetopt-2.22.orig/src/fileutils.cpp	2006-05-07 15:12:05.000000000 +0530
-+++ gengetopt-2.22/src/fileutils.cpp	2008-03-05 08:52:25.000000000 +0530
-@@ -12,6 +12,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <cstring>
- 
- #include "fileutils.h"
- 
diff --git a/gengetopt.spec b/gengetopt.spec
index 00794b6..c965daf 100644
--- a/gengetopt.spec
+++ b/gengetopt.spec
@@ -1,14 +1,12 @@
 Summary:	Tool to write command line option parsing code for C programs
 Name:		gengetopt
-Version:	2.22
+Version:	2.22.1
 Release:	1%{dist}
 License:	GPLv3+
 Group:		Development/Tools
 URL:		http://www.gnu.org/software/gengetopt/
 Source0:	ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
 
-Patch0:		%{name}-%{version}-gcc43.patch
-
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires(post):	/sbin/install-info
@@ -25,7 +23,6 @@ the C library function getopt_long to perform the actual command line parsing.
 
 %prep
 %setup -q
-%patch0 -p1
 
 # Suppress rpmlint error.
 iconv --from-code ISO8859-1 --to-code UTF-8 ./ChangeLog \
@@ -35,9 +32,7 @@ iconv --from-code ISO8859-1 --to-code UTF-8 ./THANKS \
 
 %build
 %configure
-
-# Parallel make does not work.
-make
+make %{?_smp_mflags}
 
 %check
 make check
@@ -94,6 +89,10 @@ fi
 %{_datadir}/%{name}/gnugetopt.h
 
 %changelog
+* Mon Jun 02 2008 Debarshi Ray <rishi@fedoraproject.org> - 2.22.1-1
+- Version bump to 2.22.1. Closes Red Hat Bugzilla bug #444335.
+- Parallel build problems fixed by upstream.
+
 * Fri Mar 07 2008 Debarshi Ray <rishi@fedoraproject.org> - 2.22-1
 - Version bump to 2.22. Closes Red Hat Bugzilla bug #428641.
 - Fixed build failure with gcc-4.3.
diff --git a/sources b/sources
index f8331e8..dc9230f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-346f35c9e0607733b26dcbba9fbbfa8c  gengetopt-2.22.tar.gz
+3877433c69902a26887ad65c1a2d60eb  gengetopt-2.22.1.tar.gz