commit vigra

14 Oct 2008

Hello community,

here is the log from the commit of package vigra
checked in at Tue Oct 14 19:27:19 CEST 2008.


--------

--- vigra/vigra.changes	2008-09-04 13:59:28.000000000 +0200
+++ /mounts/work_src_done/STABLE/vigra/vigra.changes	2008-10-14 16:33:49.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Oct 14 16:33:08 CEST 2008 - sbrabec@suse.cz
+
+- Fix acinclude.m4 to allow autoreconf to prevent build failure.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  vigra1.4.0-autoconf.patch

New:
----
  vigra1.6.0-autoconf.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ vigra.spec ++++++
--- /var/tmp/diff_new_pack.Z19085/_old	2008-10-14 19:26:55.000000000 +0200
+++ /var/tmp/diff_new_pack.Z19085/_new	2008-10-14 19:26:55.000000000 +0200
@@ -25,9 +25,9 @@
 AutoReqProv:    on
 Summary:        VIGRA Library
 Version:        1.6.0
-Release:        1
+Release:        2
 Source:         %{name}%{version}.tar.bz2
-Patch:          vigra1.4.0-autoconf.patch
+Patch:          vigra1.6.0-autoconf.patch
 Url:            http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -91,16 +91,12 @@
 %patch
 
 %build
-%{?suse_update_config:%{suse_update_config -f config}}
-cd config
-aclocal --acdir=.
-autoconf && mv configure ..
-cd ..
-# FIXME: It seems, that boost is ignored.
-./configure\
-	--prefix=%{_prefix}\
+export vigra_srcdir=$PWD
+cp -a config/configure.in config/acinclude.m4 .
+rm config/libtool.m4 config/status.m4 config/aclocal.m4
+ACLOCAL="aclocal -I config" autoreconf -f -i
+%configure\
 	--docdir=%{_docdir}/%{name}\
-	--libdir=%{_libdir}\
 	--with-tiff\
 	--with-jpeg\
 	--with-png\
@@ -147,6 +143,8 @@
 %doc %{_docdir}/%{name}/Ra*
 
 %changelog
+* Tue Oct 14 2008 sbrabec@suse.cz
+- Fix acinclude.m4 to allow autoreconf to prevent build failure.
 * Thu Sep 04 2008 sbrabec@suse.cz
 - Updated to version 1.6.0:
   * Added functions for arrays of arbitrary dimensions.

++++++ vigra1.4.0-autoconf.patch -> vigra1.6.0-autoconf.patch ++++++
--- vigra/vigra1.4.0-autoconf.patch	2006-07-17 14:58:50.000000000 +0200
+++ /mounts/work_src_done/STABLE/vigra/vigra1.6.0-autoconf.patch	2008-10-14 16:20:39.000000000 +0200
@@ -1,9 +1,65 @@
 --- config/acinclude.m4
 +++ config/acinclude.m4
-@@ -57,134 +57,6 @@
- 
- #########################################################
- 
+@@ -1,513 +1,3 @@
+-# redefine _AC_INIT_DEFAULTS in order to add 'ac_default_docdir=...'
+-# --------------------------------------------------------------
+-# Values which defaults can be set from `configure.ac'.
+-# `/bin/machine' is used in `glibcbug'.  The others are used in config.*
+-m4_define([_AC_INIT_DEFAULTS],
+-[m4_divert_push([DEFAULTS])dnl
+-
+-# Name of the host.
+-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+-# so uname gets run too.
+-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+-
+-exec AS_MESSAGE_FD>&1
+-
+-#
+-# Initializations.
+-#
+-ac_default_prefix=/usr/local
+-ac_default_docdir='${prefix}/doc/vigra'
+-ac_config_libobj_dir=.
+-cross_compiling=no
+-subdirs=
+-MFLAGS=
+-MAKEFLAGS=
+-AC_SUBST([SHELL], [${CONFIG_SHELL-/bin/sh}])dnl
+-AC_SUBST([PATH_SEPARATOR])dnl
+-
+-# Maximum number of lines to put in a shell here document.
+-# This variable seems obsolete.  It should probably be removed, and
+-# only ac_max_sed_lines should be used.
+-: ${ac_max_here_lines=38}
+-
+-# Identity of this package.
+-AC_SUBST([PACKAGE_NAME],
+-	 [m4_ifdef([AC_PACKAGE_NAME],      ['AC_PACKAGE_NAME'])])dnl
+-AC_SUBST([PACKAGE_TARNAME],
+-	 [m4_ifdef([AC_PACKAGE_TARNAME],   ['AC_PACKAGE_TARNAME'])])dnl
+-AC_SUBST([PACKAGE_VERSION],
+-	 [m4_ifdef([AC_PACKAGE_VERSION],   ['AC_PACKAGE_VERSION'])])dnl
+-AC_SUBST([PACKAGE_STRING],
+-	 [m4_ifdef([AC_PACKAGE_STRING],    ['AC_PACKAGE_STRING'])])dnl
+-AC_SUBST([PACKAGE_BUGREPORT],
+-	 [m4_ifdef([AC_PACKAGE_BUGREPORT], ['AC_PACKAGE_BUGREPORT'])])dnl
+-
+-m4_divert_pop([DEFAULTS])dnl
+-m4_wrap([m4_divert_text([DEFAULTS],
+-[ac_subst_vars='m4_ifdef([_AC_SUBST_VARS],  [m4_defn([_AC_SUBST_VARS])])'
+-ac_subst_files='m4_ifdef([_AC_SUBST_FILES], [m4_defn([_AC_SUBST_FILES])])'])])dnl
+-])# _AC_INIT_DEFAULTS
+-
+-#########################################################
+-
+-# AC_DOCDIR_DEFAULT(DOCDIR)
+-# -------------------------
+-AC_DEFUN([VIGRA_DOCDIR_DEFAULT],
+-[m4_divert_text([DEFAULTS], [ac_default_docdir=$1])])
+-
+-#########################################################
+-
 -# redefine _AC_INIT_HELP in order to get better control over
 -# default settings for output directories
 -# ----------------------------------------------------------
@@ -132,6 +188,329 @@
 -test -n "$ac_init_help" && exit 0
 -m4_divert_pop([HELP_END])dnl
 -])# _AC_INIT_HELP
- 
- #########################################################
- 
+-
+-#########################################################
+-
+-
+-# redefine _AC_INIT_PARSE_ARGS to add 'docdir'
+-# --------------------------------------------
+-m4_define([_AC_INIT_PARSE_ARGS],
+-[m4_divert_push([PARSE_ARGS])dnl
+-
+-# Initialize some variables set by options.
+-ac_init_help=
+-ac_init_version=false
+-# The variables have the same names as the options, with
+-# dashes changed to underlines.
+-cache_file=/dev/null
+-AC_SUBST(exec_prefix, NONE)dnl
+-no_create=
+-no_recursion=
+-AC_SUBST(prefix, NONE)dnl
+-program_prefix=NONE
+-program_suffix=NONE
+-AC_SUBST(program_transform_name, [s,x,x,])dnl
+-silent=
+-site=
+-srcdir=
+-verbose=
+-x_includes=NONE
+-x_libraries=NONE
+-
+-# Installation directory options.
+-# These are left unexpanded so users can "make install exec_prefix=/foo"
+-# and all the variables that are supposed to be based on exec_prefix
+-# by default will actually change.
+-# Use braces instead of parens because sh, perl, etc. also accept them.
+-AC_SUBST([bindir],         ['${exec_prefix}/bin'])dnl
+-AC_SUBST([libdir],         ['${exec_prefix}/lib'])dnl
+-AC_SUBST([includedir],     ['${prefix}/include'])dnl
+-AC_SUBST([docdir],         [$ac_default_docdir])dnl
+-
+-ac_prev=
+-for ac_option
+-do
+-  # If the previous option needs an argument, assign it.
+-  if test -n "$ac_prev"; then
+-    eval "$ac_prev=\$ac_option"
+-    ac_prev=
+-    continue
+-  fi
+-
+-  ac_optarg=`expr "x$ac_option" : 'x[[^=]]*=\(.*\)'`
+-
+-  # Accept the important Cygnus configure options, so we can diagnose typos.
+-
+-  case $ac_option in
+-
+-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+-    ac_prev=bindir ;;
+-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+-    bindir=$ac_optarg ;;
+-
+-  -build | --build | --buil | --bui | --bu)
+-    ac_prev=build_alias ;;
+-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+-    build_alias=$ac_optarg ;;
+-
+-  -cache-file | --cache-file | --cache-fil | --cache-fi \
+-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+-    ac_prev=cache_file ;;
+-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+-    cache_file=$ac_optarg ;;
+-
+-  --config-cache | -C)
+-    cache_file=config.cache ;;
+-
+-  -disable-* | --disable-*)
+-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+-    # Reject names that are not valid shell variable names.
+-    expr "x$ac_feature" : "[.*[^-_$as_cr_alnum]]" >/dev/null &&
+-      AC_MSG_ERROR([invalid feature name: $ac_feature])
+-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+-    eval "enable_$ac_feature=no" ;;
+-
+-  -docdir | --docdir | --docdi | --docd | --doc | --do)
+-    ac_prev=docdir ;;
+-  -docdir=* | --docdir=* | --docdi=* | --docd=* | --doc=* | --do=* )
+-    docdir=$ac_optarg ;;
+-
+-  -enable-* | --enable-*)
+-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([[^=]]*\)'`
+-    # Reject names that are not valid shell variable names.
+-    expr "x$ac_feature" : "[.*[^-_$as_cr_alnum]]" >/dev/null &&
+-      AC_MSG_ERROR([invalid feature name: $ac_feature])
+-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+-    case $ac_option in
+-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+-      *) ac_optarg=yes ;;
+-    esac
+-    eval "enable_$ac_feature='$ac_optarg'" ;;
+-
+-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+-  | --exec | --exe | --ex)
+-    ac_prev=exec_prefix ;;
+-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+-  | --exec=* | --exe=* | --ex=*)
+-    exec_prefix=$ac_optarg ;;
+-
+-  -gas | --gas | --ga | --g)
+-    # Obsolete; use --with-gas.
+-    with_gas=yes ;;
+-
+-  -help | --help | --hel | --he | -h)
+-    ac_init_help=long ;;
+-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+-    ac_init_help=recursive ;;
+-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+-    ac_init_help=short ;;
+-
+-  -host | --host | --hos | --ho)
+-    ac_prev=host_alias ;;
+-  -host=* | --host=* | --hos=* | --ho=*)
+-    host_alias=$ac_optarg ;;
+-
+-  -includedir | --includedir | --includedi | --included | --include \
+-  | --includ | --inclu | --incl | --inc)
+-    ac_prev=includedir ;;
+-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+-  | --includ=* | --inclu=* | --incl=* | --inc=*)
+-    includedir=$ac_optarg ;;
+-
+-  -libdir | --libdir | --libdi | --libd)
+-    ac_prev=libdir ;;
+-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+-    libdir=$ac_optarg ;;
+-
+-  -nfp | --nfp | --nf)
+-    # Obsolete; use --without-fp.
+-    with_fp=no ;;
+-
+-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+-  | --no-cr | --no-c | -n)
+-    no_create=yes ;;
+-
+-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+-    no_recursion=yes ;;
+-
+-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+-    ac_prev=prefix ;;
+-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+-    prefix=$ac_optarg ;;
+-
+-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+-  | --program-pre | --program-pr | --program-p)
+-    ac_prev=program_prefix ;;
+-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+-    program_prefix=$ac_optarg ;;
+-
+-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+-  | --program-suf | --program-su | --program-s)
+-    ac_prev=program_suffix ;;
+-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+-    program_suffix=$ac_optarg ;;
+-
+-  -program-transform-name | --program-transform-name \
+-  | --program-transform-nam | --program-transform-na \
+-  | --program-transform-n | --program-transform- \
+-  | --program-transform | --program-transfor \
+-  | --program-transfo | --program-transf \
+-  | --program-trans | --program-tran \
+-  | --progr-tra | --program-tr | --program-t)
+-    ac_prev=program_transform_name ;;
+-  -program-transform-name=* | --program-transform-name=* \
+-  | --program-transform-nam=* | --program-transform-na=* \
+-  | --program-transform-n=* | --program-transform-=* \
+-  | --program-transform=* | --program-transfor=* \
+-  | --program-transfo=* | --program-transf=* \
+-  | --program-trans=* | --program-tran=* \
+-  | --progr-tra=* | --program-tr=* | --program-t=*)
+-    program_transform_name=$ac_optarg ;;
+-
+-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+-  | -silent | --silent | --silen | --sile | --sil)
+-    silent=yes ;;
+-
+-  -site | --site | --sit)
+-    ac_prev=site ;;
+-  -site=* | --site=* | --sit=*)
+-    site=$ac_optarg ;;
+-
+-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+-    ac_prev=srcdir ;;
+-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+-    srcdir=$ac_optarg ;;
+-
+-  -target | --target | --targe | --targ | --tar | --ta | --t)
+-    ac_prev=target_alias ;;
+-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+-    target_alias=$ac_optarg ;;
+-
+-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+-    verbose=yes ;;
+-
+-  -version | --version | --versio | --versi | --vers | -V)
+-    ac_init_version=: ;;
+-
+-  -with-* | --with-*)
+-    ac_package=`expr "x$ac_option" : 'x-*with-\([[^=]]*\)'`
+-    # Reject names that are not valid shell variable names.
+-    expr "x$ac_package" : "([.*[^-_$as_cr_alnum]])" >/dev/null &&
+-      AC_MSG_ERROR([invalid package name: $ac_package])
+-    ac_package=`echo $ac_package| sed 's/-/_/g'`
+-    case $ac_option in
+-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+-      *) ac_optarg=yes ;;
+-    esac
+-    eval "with_$ac_package='$ac_optarg'" ;;
+-
+-  -without-* | --without-*)
+-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+-    # Reject names that are not valid shell variable names.
+-    expr "x$ac_package" : "([.*[^-_$as_cr_alnum]])" >/dev/null &&
+-      AC_MSG_ERROR([invalid package name: $ac_package])
+-    ac_package=`echo $ac_package | sed 's/-/_/g'`
+-    eval "with_$ac_package=no" ;;
+-
+-  --x)
+-    # Obsolete; use --with-x.
+-    with_x=yes ;;
+-
+-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+-  | --x-incl | --x-inc | --x-in | --x-i)
+-    ac_prev=x_includes ;;
+-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+-    x_includes=$ac_optarg ;;
+-
+-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+-    ac_prev=x_libraries ;;
+-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+-    x_libraries=$ac_optarg ;;
+-
+-  -*) AC_MSG_ERROR([unrecognized option: $ac_option
+-Try `$[0] --help' for more information.])
+-    ;;
+-
+-  *=*)
+-    ac_envvar=`expr "x$ac_option" : 'x\([[^=]]*\)='`
+-    # Reject names that are not valid shell variable names.
+-    expr "x$ac_envvar" : "[.*[^_$as_cr_alnum]]" >/dev/null &&
+-      AC_MSG_ERROR([invalid variable name: $ac_envvar])
+-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+-    eval "$ac_envvar='$ac_optarg'"
+-    export $ac_envvar ;;
+-
+-  *)
+-    # FIXME: should be removed in autoconf 3.0.
+-    AC_MSG_WARN([you should use --build, --host, --target])
+-    expr "x$ac_option" : "[.*[^-._$as_cr_alnum]]" >/dev/null &&
+-      AC_MSG_WARN([invalid host type: $ac_option])
+-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+-    ;;
+-
+-  esac
+-done
+-
+-if test -n "$ac_prev"; then
+-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+-  AC_MSG_ERROR([missing argument to $ac_option])
+-fi
+-
+-# Be sure to have absolute paths.
+-for ac_var in exec_prefix prefix
+-do
+-  eval ac_val=$`echo $ac_var`
+-  case $ac_val in
+-    [[\\/$]]* | ?:[[\\/]]* | NONE | '' ) ;;
+-    *)  AC_MSG_ERROR([expected an absolute directory name for --$ac_var: $ac_val]);;
+-  esac
+-done
+-
+-# Be sure to have absolute paths.
+-for ac_var in bindir libdir includedir docdir
+-do
+-  eval ac_val=$`echo $ac_var`
+-  case $ac_val in
+-    [[\\/$]]* | ?:[[\\/]]* ) ;;
+-    *)  AC_MSG_ERROR([expected an absolute directory name for --$ac_var: $ac_val]);;
+-  esac
+-done
+-
+-# There might be people who depend on the old broken behavior: `$host'
+-# used to hold the argument of --host etc.
+-# FIXME: To remove some day.
+-build=$build_alias
+-host=$host_alias
+-target=$target_alias
+-
+-# FIXME: To remove some day.
+-if test "x$host_alias" != x; then
+-  if test "x$build_alias" = x; then
+-    cross_compiling=maybe
+-    AC_MSG_WARN([If you wanted to set the --build type, don't use --host.
+-    If a cross compiler is detected then cross compile mode will be used.])
+-  elif test "x$build_alias" != "x$host_alias"; then
+-    cross_compiling=yes
+-  fi
+-fi
+-
+-ac_tool_prefix=
+-test -n "$host_alias" && ac_tool_prefix=$host_alias-
+-
+-test "$silent" = yes && exec AS_MESSAGE_FD>/dev/null
+-
+-m4_divert_pop([PARSE_ARGS])dnl
+-])# _AC_INIT_PARSE_ARGS
+-
+ dnl-------------------------------------------------------------------
+ dnl      VIGRA external package configuration macros
+ dnl-------------------------------------------------------------------


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

commit vigra

root＠Hilbert.suse.de