From e0828fe696feb69ef43a4511c23e3bed730da51af2791311180641f2d6dc24b2 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Fri, 14 Jun 2013 15:16:02 +0000
Subject: [PATCH 1/2] - fix popt-libc-updates.patch to work also with automake
 1.13

OBS-URL: https://build.opensuse.org/package/show/Base:System/popt?expand=0&rev=39
---
 popt-libc-updates.patch | 21 +++++++++++++++++++++
 popt.changes            |  5 +++++
 popt.spec               |  1 -
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/popt-libc-updates.patch b/popt-libc-updates.patch
index 3c9bc9a..fe523d6 100644
--- a/popt-libc-updates.patch
+++ b/popt-libc-updates.patch
@@ -1,3 +1,5 @@
+Index: configure.ac
+===================================================================
 --- configure.ac.orig
 +++ configure.ac
 @@ -21,7 +21,7 @@ AC_SUBST(LT_AGE, 8)
@@ -33,6 +35,8 @@
  
  AM_GNU_GETTEXT([external])
  AM_ICONV_LINK
+Index: system.h
+===================================================================
 --- system.h.orig
 +++ system.h
 @@ -1,10 +1,9 @@
@@ -79,6 +83,8 @@
  #endif
  
  #if !defined(__GNUC__) && !defined(__attribute__)
+Index: Makefile.am
+===================================================================
 --- Makefile.am.orig
 +++ Makefile.am
 @@ -14,7 +14,7 @@ EXTRA_DIST = config.rpath lookup3.c auto
@@ -90,6 +96,17 @@
  
  noinst_HEADERS = poptint.h system.h
  
+@@ -37,7 +37,7 @@ noinst_SCRIPTS = testit.sh
+ TESTS_ENVIRONMENT = \
+ test1="$(top_builddir)/test1"
+ 
+-TESTS = $(top_srcdir)/testit.sh
++TESTS = testit.sh
+ 
+ include_HEADERS = popt.h
+ 
+Index: popt.c
+===================================================================
 --- popt.c.orig
 +++ popt.c
 @@ -197,7 +197,7 @@ poptContext poptGetContext(const char *
@@ -127,6 +144,8 @@
        default:
  	return POPT_("unknown error");
      }
+Index: poptconfig.c
+===================================================================
 --- poptconfig.c.orig
 +++ poptconfig.c
 @@ -540,7 +540,7 @@ int poptReadDefaultConfig(poptContext co
@@ -138,6 +157,8 @@
  	char * fn = malloc(strlen(home) + 20);
  	if (fn != NULL) {
  	    (void) stpcpy(stpcpy(fn, home), "/.popt");
+Index: poptint.h
+===================================================================
 --- poptint.h.orig
 +++ poptint.h
 @@ -11,6 +11,8 @@
diff --git a/popt.changes b/popt.changes
index aa880c1..b3e68cf 100644
--- a/popt.changes
+++ b/popt.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jun 14 15:15:49 UTC 2013 - coolo@suse.com
+
+- fix popt-libc-updates.patch to work also with automake 1.13
+
 -------------------------------------------------------------------
 Mon Apr 15 09:58:18 UTC 2013 - idonmez@suse.com
 
diff --git a/popt.spec b/popt.spec
index c574b08..6029d4a 100644
--- a/popt.spec
+++ b/popt.spec
@@ -71,7 +71,6 @@ API documentation of the popt library, too.
 %patch0
 
 %build
-autoreconf -fiv
 %configure --with-pic --disable-static
 make %{?_smp_mflags}
 

From 6885906af333ff73ac314a9560348dc46872736d6c3d3c9f9dbe348b914978b6 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Mon, 17 Jun 2013 08:35:44 +0000
Subject: [PATCH 2/2] readd autoreconf

OBS-URL: https://build.opensuse.org/package/show/Base:System/popt?expand=0&rev=40
---
 popt.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/popt.spec b/popt.spec
index 6029d4a..c574b08 100644
--- a/popt.spec
+++ b/popt.spec
@@ -71,6 +71,7 @@ API documentation of the popt library, too.
 %patch0
 
 %build
+autoreconf -fiv
 %configure --with-pic --disable-static
 make %{?_smp_mflags}