diff --git a/autoconf-archive-2010.10.26.tar.xz b/autoconf-archive-2010.10.26.tar.xz deleted file mode 100644 index 047b83b..0000000 --- a/autoconf-archive-2010.10.26.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4e89b220ae15437f454b99c81675f04e08c14d3fd0fd9fba2c3310fe38f6a2c7 -size 470088 diff --git a/autoconf-archive-2012.11.14.tar.xz b/autoconf-archive-2012.11.14.tar.xz new file mode 100644 index 0000000..782cff4 --- /dev/null +++ b/autoconf-archive-2012.11.14.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3474b8fab752fe01d3f36c019a2be0b83c88c95c7fe1275ec5c426f7a3054155 +size 508604 diff --git a/autoconf-archive-AX_HAVE_QT_use_AS_HELP_STRING.patch b/autoconf-archive-AX_HAVE_QT_use_AS_HELP_STRING.patch deleted file mode 100644 index 42090b6..0000000 --- a/autoconf-archive-AX_HAVE_QT_use_AS_HELP_STRING.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- m4/ax_have_qt.m4.orig 2010-10-26 00:00:00.000000000 +0200 -+++ m4/ax_have_qt.m4 2011-03-23 14:53:45.959051749 +0100 -@@ -101,20 +101,24 @@ AC_DEFUN([AX_HAVE_QT], - AC_MSG_CHECKING(for Qt) - - AC_ARG_WITH([Qt-dir], -- [ --with-Qt-dir=DIR DIR is equal to $QTDIR if you have followed the -- installation instructions of Trolltech. Header -- files are in DIR/include, binary utilities are -- in DIR/bin. The library is in DIR/lib, unless -- --with-Qt-lib-dir is also set.]) -+ AS_HELP_STRING([--with-Qt-dir=DIR], -+ [DIR is equal to $QTDIR if you have followed the -+ installation instructions of Trolltech. Header -+ files are in DIR/include, binary utilities are -+ in DIR/bin. The library is in DIR/lib, unless -+ --with-Qt-lib-dir is also set.])) - AC_ARG_WITH([Qt-include-dir], -- [ --with-Qt-include-dir=DIR -- Qt header files are in DIR]) -+ AS_HELP_STRING([--with-Qt-include-dir=DIR], -+ [Qt header files are in DIR])) - AC_ARG_WITH([Qt-bin-dir], -- [ --with-Qt-bin-dir=DIR Qt utilities such as moc and uic are in DIR]) -+ AS_HELP_STRING([--with-Qt-bin-dir=DIR], -+ [Qt utilities such as moc and uic are in DIR])) - AC_ARG_WITH([Qt-lib-dir], -- [ --with-Qt-lib-dir=DIR The Qt library is in DIR]) -+ AS_HELP_STRING([--with-Qt-lib-dir=DIR], -+ [The Qt library is in DIR])) - AC_ARG_WITH([Qt-lib], -- [ --with-Qt-lib=LIB Use -lLIB to link with the Qt library]) -+ AS_HELP_STRING([--with-Qt-lib=LIB], -+ [Use -lLIB to link with the Qt library])) - if test x"$with_Qt_dir" = x"no" || - test x"$with_Qt_include-dir" = x"no" || - test x"$with_Qt_bin_dir" = x"no" || diff --git a/autoconf-archive-ax_have_qt_fix_library_order.patch b/autoconf-archive-ax_have_qt_fix_library_order.patch deleted file mode 100644 index a331dec..0000000 --- a/autoconf-archive-ax_have_qt_fix_library_order.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: m4/ax_have_qt.m4 -=================================================================== ---- m4/ax_have_qt.m4.orig 2011-03-23 17:27:33.000000000 +0100 -+++ m4/ax_have_qt.m4 2011-03-23 17:29:07.105463016 +0100 -@@ -313,7 +313,7 @@ EOF - echo "configure: could not compile:" >&AC_FD_CC - cat ax_qt_main.$ac_ext >&AC_FD_CC - else -- ax_try_4="$CXX $QT_LIBS $LIBS -o ax_qt_main ax_qt_main.o moc_ax_qt_test.o >/dev/null 2>/dev/null" -+ ax_try_4="$CXX -o ax_qt_main ax_qt_main.o moc_ax_qt_test.o $QT_LIBS $LIBS >/dev/null 2>/dev/null" - AC_TRY_EVAL(ax_try_4) - if test x"$ac_status" != x0; then - echo "$ax_err_4" >&AC_FD_CC diff --git a/autoconf-archive-boost_lib64.patch b/autoconf-archive-boost_lib64.patch deleted file mode 100644 index ea430ed..0000000 --- a/autoconf-archive-boost_lib64.patch +++ /dev/null @@ -1,27 +0,0 @@ -Index: m4/ax_boost_base.m4 -=================================================================== ---- m4/ax_boost_base.m4.orig 2010-08-19 00:00:00.000000000 +0200 -+++ m4/ax_boost_base.m4 2010-08-26 17:53:43.000000000 +0200 -@@ -84,15 +84,18 @@ if test "x$want_boost" = "xyes"; then - AC_MSG_CHECKING(for boostlib >= $boost_lib_version_req) - succeeded=no - -- dnl On x86_64 systems check for system libraries in both lib64 and lib. -+ dnl On x86_64, ppc64 and s390x systems check for system libraries in both lib64 and lib. - dnl The former is specified by FHS, but e.g. Debian does not adhere to - dnl this (as it rises problems for generic multi-arch support). - dnl The last entry in the list is chosen by default when no libraries - dnl are found, e.g. when only header-only libraries are installed! -+ - libsubdirs="lib" -- if test `uname -m` = x86_64; then -- libsubdirs="lib64 lib lib64" -- fi -+ case `uname -m` in -+ x86_64 | ppc64 | s390x) -+ libsubdirs="lib64 lib lib64" -+ ;; -+ esac - - dnl first we check the system location for boost libraries - dnl this location ist chosen if boost libraries are installed with the --layout=system option diff --git a/autoconf-archive-fix_AX_HAVE_QT.patch b/autoconf-archive-fix_AX_HAVE_QT.patch index b05f0d7..8798872 100644 --- a/autoconf-archive-fix_AX_HAVE_QT.patch +++ b/autoconf-archive-fix_AX_HAVE_QT.patch @@ -6,13 +6,13 @@ signed-off-by: pth@suse.de Index: m4/ax_have_qt.m4 =================================================================== ---- m4/ax_have_qt.m4.orig 2011-03-23 17:27:18.041890363 +0100 -+++ m4/ax_have_qt.m4 2011-03-23 17:27:29.844575610 +0100 -@@ -498,7 +498,6 @@ AC_DEFUN([AX_PATH_QT_DIRECT], +--- m4/ax_have_qt.m4.orig 2012-11-14 09:52:14.000000000 +0100 ++++ m4/ax_have_qt.m4 2012-12-07 23:34:57.388720186 +0100 +@@ -498,7 +498,6 @@ # We can link with no special library directory. ax_qt_lib_dir= ], [ -- # Leave ax_qt_lib_dir defined +- : # Leave ax_qt_lib_dir defined ]) ]) ]) diff --git a/autoconf-archive-no_semicolon.patch b/autoconf-archive-no_semicolon.patch deleted file mode 100644 index 685f669..0000000 --- a/autoconf-archive-no_semicolon.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: m4/ax_have_qt.m4 -=================================================================== ---- m4/ax_have_qt.m4.orig 2011-03-23 16:04:57.000000000 +0100 -+++ m4/ax_have_qt.m4 2011-03-23 16:05:47.721475469 +0100 -@@ -324,7 +324,7 @@ EOF - fi - fi - ])dnl AC_CACHE_VAL ax_cv_qt_test_result -- AC_MSG_RESULT([$ax_cv_qt_test_result]); -+ AC_MSG_RESULT([$ax_cv_qt_test_result]) - if test x"$ax_cv_qt_test_result" = "xfailure"; then - AC_MSG_ERROR([Failed to find matching components of a complete - Qt installation. Try using more options, diff --git a/autoconf-archive.changes b/autoconf-archive.changes index 4578cd9..de4fcb4 100644 --- a/autoconf-archive.changes +++ b/autoconf-archive.changes @@ -1,3 +1,50 @@ +------------------------------------------------------------------- +Fri Dec 7 23:58:17 UTC 2012 - p.drouand@gmail.com + +- Update to 2012.11.14 version: + * The portability of AX_BOOST_SYSTEM and AX_BOOST_THREAD has been improved. See + for further details. + * AX_COUNT_CPUS has been cleaned up. See + for further details. + * AX_BLAS has been extended to detect the Intel Math Kernel Library (MKL). See + for further details. + * Several bugs and inconsistencies in AX_TRY_RUN_JAVA, AX_PROG_JAVA_WORKS, + AX_CHECK_CLASS, and AX_PROG_JAVA have been fixed. See + for further details. + * AX_INCLUDE_STRCASECMP has been added. The macro detects which header file + defines the strcasecmp() function. See + for further details. + * AX_LIB_ORACLE_OCCI has been added. The macro detects the availability of the + Oracle OCCI API of particular version or newer. Further details can be found + at . + * AX_CHECK_POSTGRES_DB has been substantially re-written. The default behavior + is unchanged, but there are two new (optional) arguments ACTION-IF-FOUND and + ACTION-IF-NOT-FOUND. See for further + details. + * AX_CXX_RVALUE_REFERENCES has been added. See + for further details. + * AX_BLAS has been extended to support for the (free-software, BSD-licensed) + OpenBLAS library, a descendant of GotoBLAS. See + for further details. + * The reliability of AX_BOOST_SYSTEM and AX_BOOST_FILESYSTEM has been improved. + See for further details. + * The new entry AX_ZONEINFO has been added. Further details are available at + . + * AX_CHECK_ZLIB has been updated significantly: + - The behavior was changed so that the macro proceeds to compile and link + tests even if zlib.h was not found in the "usual locations". + - The macro interface has been extend to the typical ([action-if-found], + [action-if-not-found])-style. + - Previous versions used to search zlib in "usual locations" only if + --with-zlib was provided [by user]. Now, the macro performs that search in + default mode, too. +- Removed patches: bugs fixed on upstream release: + * autoconf-archive-ax_have_qt_fix_library_order.patch + * autoconf-archive-AX_HAVE_QT_use_AS_HELP_STRING.patch + * autoconf-archive-boost_lib64.patch + * autoconf-archive-no_semicolon.patch + ------------------------------------------------------------------- Fri Jan 20 08:15:10 UTC 2012 - cfarrell@suse.com diff --git a/autoconf-archive.spec b/autoconf-archive.spec index 78e949f..2a33eea 100644 --- a/autoconf-archive.spec +++ b/autoconf-archive.spec @@ -21,17 +21,13 @@ Name: autoconf-archive Summary: A Collection of macros for GNU autoconf License: SUSE-GPL-3.0+-with-autoconf-exception Group: Development/Tools/Building -Version: 2010.10.26 +Version: 2012.11.14 Release: 0 Source0: %{name}-%{version}.tar.xz -Patch0: autoconf-archive-boost_lib64.patch -Patch1: autoconf-archive-AX_HAVE_QT_use_AS_HELP_STRING.patch Patch2: autoconf-archive-fix_AX_HAVE_QT.patch -Patch3: autoconf-archive-no_semicolon.patch -Patch4: autoconf-archive-ax_have_qt_fix_library_order.patch Url: http://savannah.gnu.org/projects/autoconf-archive -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: xz +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Requires(pre): info @@ -53,14 +49,11 @@ some authors may choose to use it, too, for proprietary software. %prep %setup -q -%patch0 -%patch1 %patch2 -%patch3 -%patch4 %build %configure +make %{?_smp_mflags} %install %makeinstall