From c0283514c2467c3f4a84eeb3abb1e98207a8050d Mon Sep 17 00:00:00 2001
From: Anthony Green <green@moxielogic.com>
Date: Fri, 25 Nov 2011 11:27:29 -0500
Subject: [PATCH] Upgrade to autogen 5.12.

---
 .gitignore                                    |  1 +
 ...atch => autogen-5.12-autoopts-config.patch |  9 +++---
 ...nfig.patch => autogen-5.12-pkgconfig.patch |  0
 autogen.spec                                  | 32 +++++++------------
 sources                                       |  2 +-
 5 files changed, 18 insertions(+), 26 deletions(-)
 rename autogen-5.9.4-autoopts-config.patch => autogen-5.12-autoopts-config.patch (61%)
 rename autogen-5.9.4-pkgconfig.patch => autogen-5.12-pkgconfig.patch (100%)

diff --git a/.gitignore b/.gitignore
index 7f69216..c525f8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 autogen-5.9.4.tar.bz2
+/autogen-5.12.tar.gz
diff --git a/autogen-5.9.4-autoopts-config.patch b/autogen-5.12-autoopts-config.patch
similarity index 61%
rename from autogen-5.9.4-autoopts-config.patch
rename to autogen-5.12-autoopts-config.patch
index 6f63077..3b58957 100644
--- a/autogen-5.9.4-autoopts-config.patch
+++ b/autogen-5.12-autoopts-config.patch
@@ -1,6 +1,5 @@
-diff -urNp autogen-5.9.4.orig/autoopts/autoopts-config.in autogen-5.9.4/autoopts/autoopts-config.in
---- autogen-5.9.4.orig/autoopts/autoopts-config.in	2007-12-24 02:33:16.000000000 +0530
-+++ autogen-5.9.4/autoopts/autoopts-config.in	2008-02-25 00:38:27.000000000 +0530
+--- autoopts/autoopts-config.in.orig	2011-06-26 10:39:46.000000000 -0400
++++ autoopts/autoopts-config.in	2011-11-25 11:03:15.408677185 -0500
 @@ -17,17 +17,17 @@
    includedir="@includedir@"
   exec_prefix="@exec_prefix@"
@@ -21,5 +20,5 @@ diff -urNp autogen-5.9.4.orig/autoopts/autoopts-config.in autogen-5.9.4/autoopts
 - static_libs="${libdir}/libopts.a"
 + static_libs=""
        cflags="-I${includedir}"
- test -n "${ldopts}" && ldflags="${ldopts}${libdir} ${ldflags}"
- test "${includedir}" = "/usr/include" && cflags=""
+ case "${libdir}" in
+ /lib | /lib64 | /usr/lib | /usr/lib64 )
diff --git a/autogen-5.9.4-pkgconfig.patch b/autogen-5.12-pkgconfig.patch
similarity index 100%
rename from autogen-5.9.4-pkgconfig.patch
rename to autogen-5.12-pkgconfig.patch
diff --git a/autogen.spec b/autogen.spec
index 790c698..b0b1144 100644
--- a/autogen.spec
+++ b/autogen.spec
@@ -1,22 +1,18 @@
 Summary:	Automated text file generator
 Name:		autogen
-Version:	5.9.4
-Release:	8%{?dist}
+Version:	5.12
+Release:	1%{?dist}
 # Some files are licensed under GPLv2+.
 # We redistribute them under GPLv3+.
 License:	GPLv3+
 Group:		Development/Tools
 URL:		http://www.gnu.org/software/autogen/
-Source0:	ftp://ftp.gnu.org/gnu/autogen/rel5.9.4/%{name}-%{version}.tar.bz2
+Source0:	ftp://ftp.gnu.org/gnu/autogen/rel5.12/%{name}-%{version}.tar.gz
 
 Patch0:		%{name}-%{version}-autoopts-config.patch
 Patch1:		%{name}-%{version}-pkgconfig.patch
 
-BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-
-# Will be dropped in Fedora 10.
-Provides:	%{name}-manuals = %{version}-%{release}
-Obsoletes:	%{name}-manuals < 5.9.4-1
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	%{name}-libopts = %{version}-%{release}
 Requires(post):	/sbin/install-info
@@ -51,10 +47,6 @@ Summary:	Development files for libopts
 License:	LGPLv3+
 Group:		Development/Libraries
 
-# Will be dropped in Fedora 10.
-Provides:	%{name}-devel = %{version}-%{release}
-Obsoletes:	%{name}-devel < 5.9.4-1
-
 Requires:	automake
 Requires:	%{name}-libopts = %{version}-%{release}
 Requires:	pkgconfig
@@ -64,7 +56,7 @@ This package contains development files for libopts.
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p0
 %patch1 -p1
 
 %build
@@ -80,7 +72,7 @@ cp %{_bindir}/libtool .
 # Omit unused direct shared library dependencies.
 sed --in-place --expression 's! -shared ! -Wl,--as-needed\0!g' ./libtool
 
-make %{?_smp_mflags}
+make #%{?_smp_mflags}
 
 %check
 # make check
@@ -137,24 +129,21 @@ fi
 %{_mandir}/man1/xml2ag.1.gz
 
 %dir %{_datadir}/%{name}
-%{_datadir}/%{name}/stdoptions.def
-%{_datadir}/%{name}/*.tpl
+%{_datadir}/%{name}/*
 
 %files libopts
 %defattr(-,root,root,-)
 %doc pkg/libopts/COPYING.mbsd
 %doc pkg/libopts/COPYING.lgplv3
-%{_libdir}/libguileopts.so.*
 %{_libdir}/libopts.so.*
 
 %files libopts-devel
 %defattr(-,root,root,-)
 %{_bindir}/autoopts-config
 %{_datadir}/aclocal/autoopts.m4
-%{_datadir}/aclocal/liboptschk.m4
-%{_libdir}/libguileopts.so
+#%{_datadir}/aclocal/liboptschk.m4
 %{_libdir}/libopts.so
-%{_libdir}/pkgconfig/autoopts.pc
+%{_datadir}/pkgconfig/autoopts.pc
 %{_mandir}/man1/autoopts-config.1.gz
 %{_mandir}/man3/*
 
@@ -163,6 +152,9 @@ fi
 %{_includedir}/autoopts/usage-txt.h
 
 %changelog
+* Fri Nov 25 2011 Anthony Green <green@redhat.com> - 5.12-1
+- Upgrade.
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.9.4-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 7ec56a3..24ef5bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cd447b063675625b915546204f59db4b  autogen-5.9.4.tar.bz2
+6c6671b76021fb30dd43b0d5fdb7180b  autogen-5.12.tar.gz