[libguess] Patch configure.ac to define m4 macro dir.

Michael Schwendt mschwendt at fedoraproject.org
Sun Apr 21 08:26:45 UTC 2013


commit c7967c0ebc1c3111c4d82a754b8c9249756793a3
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Sun Apr 21 10:26:18 2013 +0200

    Patch configure.ac to define m4 macro dir.
    
    - BR autoconf libtool and run autoreconf -f for aarch64 updates (#925758).

 libguess-1.1-m4-dir.patch |   11 +++++++++++
 libguess.spec             |   15 ++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/libguess-1.1-m4-dir.patch b/libguess-1.1-m4-dir.patch
new file mode 100644
index 0000000..e126d77
--- /dev/null
+++ b/libguess-1.1-m4-dir.patch
@@ -0,0 +1,11 @@
+diff -Nur libguess-1.1-orig/configure.ac libguess-1.1/configure.ac
+--- libguess-1.1-orig/configure.ac	2011-12-01 14:00:59.000000000 +0100
++++ libguess-1.1/configure.ac	2013-04-21 10:04:36.606810657 +0200
+@@ -5,6 +5,7 @@
+ AC_INIT([libguess], [1.1], [bugs+libguess at atheme.org])
+ AC_CONFIG_SRCDIR([src/libguess/guess.c])
+ AC_CONFIG_HEADER([src/libguess/autoconf.h])
++AC_CONFIG_MACRO_DIR([m4])
+ 
+ AC_CANONICAL_HOST
+ AC_CANONICAL_TARGET
diff --git a/libguess.spec b/libguess.spec
index 65a059d..858b3b9 100644
--- a/libguess.spec
+++ b/libguess.spec
@@ -1,6 +1,6 @@
 Name: libguess
 Version: 1.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 Summary: High-speed character set detection library
 Group: System Environment/Libraries
@@ -8,8 +8,13 @@ License: BSD
 URL: http://www.atheme.org/project/libguess
 Source0: http://distfiles.atheme.org/libguess-%{version}.tar.bz2
 
+# Without this, adding "-I m4" to autoreconf call would be needed.
+# reported upstream
+Patch0: libguess-1.1-m4-dir.patch
+
 BuildRequires: pkgconfig
 BuildRequires: libmowgli-devel >= 0.9.50
+BuildRequires: autoconf libtool
 
 %description
 libguess employs discrete-finite automata to deduce the character set of
@@ -34,6 +39,10 @@ software that uses %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .no-m4-dir
+# https://bugzilla.redhat.com/925758
+autoreconf -f
+
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
 
@@ -69,6 +78,10 @@ LD_LIBRARY_PATH=${RPM_BUILD_ROOT}%{_libdir} make
 
 
 %changelog
+* Sun Apr 21 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 1.1-5
+- Patch configure.ac to define m4 macro dir.
+- BR autoconf libtool and run autoreconf -f for aarch64 updates (#925758).
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list