[nano/f19] run autoreconf in %prep to support aarch64 with autoconf 2.69+ (#926195)

Kamil Dudka kdudka at fedoraproject.org
Thu Apr 4 13:14:46 UTC 2013


commit 56ae2fb5640c5cd899402b3b713c1369af9debfb
Author: Kamil Dudka <kdudka at redhat.com>
Date:   Thu Apr 4 15:08:43 2013 +0200

    run autoreconf in %prep to support aarch64 with autoconf 2.69+ (#926195)

 ...se-futimens-if-available-instead-of-utime.patch |   31 +-------------------
 nano.spec                                          |   12 ++++---
 2 files changed, 8 insertions(+), 35 deletions(-)
---
diff --git a/0002-use-futimens-if-available-instead-of-utime.patch b/0002-use-futimens-if-available-instead-of-utime.patch
index d2a687f..c27136d 100644
--- a/0002-use-futimens-if-available-instead-of-utime.patch
+++ b/0002-use-futimens-if-available-instead-of-utime.patch
@@ -4,39 +4,10 @@ Date: Thu, 19 Aug 2010 15:23:06 +0200
 Subject: [PATCH 2/2] use futimens() if available, instead of utime()
 
 ---
- config.h.in  |    3 +++
- configure    |    2 +-
  configure.ac |    2 +-
  src/files.c  |   48 +++++++++++++++++++++++++++++++++++-------------
- 4 files changed, 40 insertions(+), 15 deletions(-)
+ 2 files changed, 36 insertions(+), 14 deletions(-)
 
-diff --git a/config.h.in b/config.h.in
-index 52e13f1..cb17b29 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -64,6 +64,9 @@
- /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
- #undef HAVE_DOPRNT
- 
-+/* Define to 1 if you have the `futimens' function. */
-+#undef HAVE_FUTIMENS
-+
- /* Define to 1 if you have the `getdelim' function. */
- #undef HAVE_GETDELIM
- 
-diff --git a/configure b/configure
-index 02733c7..1805e53 100755
---- a/configure
-+++ b/configure
-@@ -7484,7 +7484,7 @@ fi
- 
- 
- 
--for ac_func in getdelim getline isblank strcasecmp strcasestr strncasecmp strnlen vsnprintf
-+for ac_func in futimens getdelim getline isblank strcasecmp strcasestr strncasecmp strnlen vsnprintf
- do :
-   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
- ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
 diff --git a/configure.ac b/configure.ac
 index 66f8ee3..f4975d3 100644
 --- a/configure.ac
diff --git a/nano.spec b/nano.spec
index e30d95c..cd00884 100644
--- a/nano.spec
+++ b/nano.spec
@@ -1,7 +1,7 @@
 Summary:         A small text editor
 Name:            nano
 Version:         2.3.1
-Release:         6%{?dist}
+Release:         7%{?dist}
 License:         GPLv3+
 Group:           Applications/Editors
 URL:             http://www.nano-editor.org
@@ -16,7 +16,7 @@ Patch1:          0001-check-stat-s-result-and-avoid-calling-stat-on-a-NULL.patch
 Patch2:          0002-use-futimens-if-available-instead-of-utime.patch
 
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:   autoconf
+BuildRequires:   automake
 BuildRequires:   gettext-devel
 BuildRequires:   groff
 BuildRequires:   ncurses-devel
@@ -39,9 +39,8 @@ for f in doc/man/fr/{nano.1,nanorc.5,rnano.1} ; do
   touch $f.html
 done
 
-# do not run autotools, we have already reflected the configure.ac
-# changes in configure and config.h.in
-touch -c aclocal.m4 config.h.in configure Makefile.in
+# needed by 0002-use-futimens-if-available-instead-of-utime.patch and bz #926195
+autoreconf -fiv
 
 %build
 %configure
@@ -88,6 +87,9 @@ exit 0
 %{_datadir}/nano
 
 %changelog
+* Thu Apr 04 2013 Kamil Dudka <kdudka at redhat.com> - 2.3.1-7
+- run autoreconf in %%prep to support aarch64 with autoconf 2.69+ (#926195)
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list