Mailinglist Archive: opensuse-commit (1945 mails)
| < Previous | Next > |
commit yast2-control-center
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Mon, 03 Nov 2008 14:35:05 +0100
- Message-id: <20081103133505.E89736780AA@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2-control-center
checked in at Mon Nov 3 14:35:05 CET 2008.
--------
--- yast2-control-center/yast2-control-center.changes 2008-05-16
21:48:29.000000000 +0200
+++
/mounts/work_src_done/STABLE/yast2-control-center/yast2-control-center.changes
2008-10-29 15:22:11.962253000 +0100
@@ -1,0 +2,6 @@
+Wed Oct 29 15:20:18 CET 2008 - sh@xxxxxxx
+
+- Fixed bnc #438197: Need to scroll categories
+- V 2.17.2
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-control-center-2.16.2.tar.bz2
New:
----
yast2-control-center-2.17.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-control-center.spec ++++++
--- /var/tmp/diff_new_pack.d26795/_old 2008-11-03 14:34:39.000000000 +0100
+++ /var/tmp/diff_new_pack.d26795/_new 2008-11-03 14:34:39.000000000 +0100
@@ -1,10 +1,17 @@
#
-# spec file for package yast2-control-center (Version 2.16.2)
+# spec file for package yast2-control-center (Version 2.17.2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -12,12 +19,12 @@
Name: yast2-control-center
-Version: 2.16.2
-Release: 6
+Version: 2.17.2
+Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-control-center-2.16.2.tar.bz2
+Source0: yast2-control-center-2.17.2.tar.bz2
Prefix: /usr
BuildRequires: libdrm-devel libjpeg-devel pkgconfig qt3-devel
update-desktop-files yast2-devtools
Summary: YaST2 - Control Center
@@ -48,7 +55,7 @@
%prep
-%setup -n yast2-control-center-2.16.2
+%setup -n yast2-control-center-2.17.2
%build
%{prefix}/bin/y2tool y2autoconf
@@ -82,6 +89,9 @@
%{prefix}/lib/YaST2/bin/y2controlcenter
%doc %{prefix}/share/doc/packages/yast2-control-center
%changelog
+* Wed Oct 29 2008 sh@xxxxxxx
+- Fixed bnc #438197: Need to scroll categories
+- V 2.17.2
* Fri May 16 2008 jsrain@xxxxxxx
- added categories Settings and System into desktop file
(bnc #382778)
@@ -409,7 +419,7 @@
- bug 5490 Multiple clicks onto help causes problems
* Sat Jan 13 2001 mike@xxxxxxx
- new icons
-* Thu Jan 04 2001 mike@xxxxxxx
+* Wed Jan 03 2001 mike@xxxxxxx
- new icons, little fixes
The modules REMOTE-INSTALL and REMOTE-ADMIN are not available any more
* Thu Dec 14 2000 kkaempf@xxxxxxx
++++++ yast2-control-center-2.16.2.tar.bz2 ->
yast2-control-center-2.17.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-control-center-2.16.2/aclocal.m4
new/yast2-control-center-2.17.2/aclocal.m4
--- old/yast2-control-center-2.16.2/aclocal.m4 2008-05-16 22:20:05.000000000
+0200
+++ new/yast2-control-center-2.17.2/aclocal.m4 2008-10-29 15:21:25.000000000
+0100
@@ -7519,3 +7519,159 @@
AC_MSG_RESULT([$SED])
])
+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+#
+# Copyright © 2004 Scott James Remnant <scott@xxxxxxxxxxxx>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=m4_default([$1], [0.9.0])
+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ PKG_CONFIG=""
+ fi
+
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists. Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+#
+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+# this or PKG_CHECK_MODULES is called, or make sure to call
+# PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+ m4_ifval([$2], [$2], [:])
+m4_ifvaln([$3], [else
+ $3])dnl
+fi])
+
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_failed=yes])
+ else
+ pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables
$1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+ _PKG_SHORT_ERRORS_SUPPORTED
+ if test $_pkg_short_errors_supported = yes; then
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2"
2>&1`
+ else
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+ ifelse([$4], , [AC_MSG_ERROR(dnl
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT
+])],
+ [AC_MSG_RESULT([no])
+ $4])
+elif test $pkg_failed = untried; then
+ ifelse([$4], , [AC_MSG_FAILURE(dnl
+[The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+ [$4])
+else
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+ AC_MSG_RESULT([yes])
+ ifelse([$3], , :, [$3])
+fi[]dnl
+])# PKG_CHECK_MODULES
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-control-center-2.16.2/configure
new/yast2-control-center-2.17.2/configure
--- old/yast2-control-center-2.16.2/configure 2008-05-16 22:20:07.000000000
+0200
+++ new/yast2-control-center-2.17.2/configure 2008-10-29 15:21:28.000000000
+0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-control-center 2.16.2.
+# Generated by GNU Autoconf 2.61 for yast2-control-center 2.17.2.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-control-center'
PACKAGE_TARNAME='yast2-control-center'
-PACKAGE_VERSION='2.16.2'
-PACKAGE_STRING='yast2-control-center 2.16.2'
+PACKAGE_VERSION='2.17.2'
+PACKAGE_STRING='yast2-control-center 2.17.2'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -899,6 +899,9 @@
am__fastdepCC_TRUE
am__fastdepCC_FALSE
CPP
+PKG_CONFIG
+Y2CORE_CFLAGS
+Y2CORE_LIBS
AGENT_LIBADD
SED
GREP
@@ -933,6 +936,9 @@
CC
CFLAGS
CPP
+PKG_CONFIG
+Y2CORE_CFLAGS
+Y2CORE_LIBS
CXXCPP
F77
FFLAGS
@@ -1439,7 +1445,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-control-center 2.16.2 to adapt to many kinds of
systems.
+\`configure' configures yast2-control-center 2.17.2 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1514,7 +1520,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-control-center 2.16.2:";;
+ short | recursive ) echo "Configuration of yast2-control-center 2.17.2:";;
esac
cat <<\_ACEOF
@@ -1555,6 +1561,10 @@
CC C compiler command
CFLAGS C compiler flags
CPP C preprocessor
+ PKG_CONFIG path to pkg-config utility
+ Y2CORE_CFLAGS
+ C compiler flags for Y2CORE, overriding pkg-config
+ Y2CORE_LIBS linker flags for Y2CORE, overriding pkg-config
CXXCPP C++ preprocessor
F77 Fortran 77 compiler command
FFLAGS Fortran 77 compiler flags
@@ -1624,7 +1634,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-control-center configure 2.16.2
+yast2-control-center configure 2.17.2
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1638,7 +1648,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-control-center $as_me 2.16.2, which was
+It was created by yast2-control-center $as_me 2.17.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2459,7 +2469,7 @@
# Define the identity of the package.
PACKAGE='yast2-control-center'
- VERSION='2.16.2'
+ VERSION='2.17.2'
cat >>confdefs.h <<_ACEOF
@@ -2687,7 +2697,7 @@
-VERSION="2.16.2"
+VERSION="2.17.2"
RPMNAME="yast2-control-center"
MAINTAINER="Stefan Hundhammer <sh@xxxxxxx>"
@@ -4852,8 +4862,247 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes"
-CXXFLAGS="${CXXFLAGS} -Wall -Wformat=2"
+# If we have core, get its Y2CORE_CFLAGS.
+# When building core itself, it has set Y2CORE_CFLAGS elsewhere already
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a
program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a
path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x
"$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with
args.
+set dummy pkg-config; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $ac_pt_PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the
test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x
"$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+ { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+ if test "x$ac_pt_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect
cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@xxxxxxxx" >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf@xxxxxxxx" >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+ fi
+else
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=0.9.0
+ { echo "$as_me:$LINENO: checking pkg-config is at least version
$_pkg_min_version" >&5
+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version...
$ECHO_C" >&6; }
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ PKG_CONFIG=""
+ fi
+
+fi
+if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"yast2-core\"") >&5
+ ($PKG_CONFIG --exists --print-errors "yast2-core") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for Y2CORE" >&5
+echo $ECHO_N "checking for Y2CORE... $ECHO_C" >&6; }
+
+if test -n "$Y2CORE_CFLAGS"; then
+ pkg_cv_Y2CORE_CFLAGS="$Y2CORE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"yast2-core\"") >&5
+ ($PKG_CONFIG --exists --print-errors "yast2-core") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_Y2CORE_CFLAGS=`$PKG_CONFIG --cflags "yast2-core" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$Y2CORE_LIBS"; then
+ pkg_cv_Y2CORE_LIBS="$Y2CORE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"yast2-core\"") >&5
+ ($PKG_CONFIG --exists --print-errors "yast2-core") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_Y2CORE_LIBS=`$PKG_CONFIG --libs "yast2-core" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ Y2CORE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
"yast2-core" 2>&1`
+ else
+ Y2CORE_PKG_ERRORS=`$PKG_CONFIG --print-errors "yast2-core" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$Y2CORE_PKG_ERRORS" >&5
+
+ { { echo "$as_me:$LINENO: error: Package requirements (yast2-core) were
not met:
+
+$Y2CORE_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables Y2CORE_CFLAGS
+and Y2CORE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+echo "$as_me: error: Package requirements (yast2-core) were not met:
+
+$Y2CORE_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables Y2CORE_CFLAGS
+and Y2CORE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
+ { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be
found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables Y2CORE_CFLAGS
+and Y2CORE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&5
+echo "$as_me: error: The pkg-config script could not be found or is too old.
Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables Y2CORE_CFLAGS
+and Y2CORE_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+else
+ Y2CORE_CFLAGS=$pkg_cv_Y2CORE_CFLAGS
+ Y2CORE_LIBS=$pkg_cv_Y2CORE_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ :
+fi
+
+fi
+
+CFLAGS="${CFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes"
+CXXFLAGS="${CXXFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2"
: ${AGENT_LIBADD:='-L$(libdir) -lscr'}
@@ -5573,7 +5822,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5576 "configure"' > conftest.$ac_ext
+ echo '#line 5825 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7928,11 +8177,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7931: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8180: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7935: \$? = $ac_status" >&5
+ echo "$as_me:8184: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8218,11 +8467,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8221: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8470: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8225: \$? = $ac_status" >&5
+ echo "$as_me:8474: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8322,11 +8571,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8325: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8574: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8329: \$? = $ac_status" >&5
+ echo "$as_me:8578: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10686,7 +10935,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10689 "configure"
+#line 10938 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10786,7 +11035,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10789 "configure"
+#line 11038 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13187,11 +13436,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13190: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13439: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13194: \$? = $ac_status" >&5
+ echo "$as_me:13443: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13291,11 +13540,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13294: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13543: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13298: \$? = $ac_status" >&5
+ echo "$as_me:13547: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14874,11 +15123,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14877: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15126: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14881: \$? = $ac_status" >&5
+ echo "$as_me:15130: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14978,11 +15227,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14981: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15230: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14985: \$? = $ac_status" >&5
+ echo "$as_me:15234: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17185,11 +17434,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17188: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17437: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17192: \$? = $ac_status" >&5
+ echo "$as_me:17441: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17475,11 +17724,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17478: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17727: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17482: \$? = $ac_status" >&5
+ echo "$as_me:17731: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17579,11 +17828,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17582: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17831: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17586: \$? = $ac_status" >&5
+ echo "$as_me:17835: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -21490,7 +21739,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-control-center $as_me 2.16.2, which was
+This file was extended by yast2-control-center $as_me 2.17.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21543,7 +21792,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-control-center config.status 2.16.2
+yast2-control-center config.status 2.17.2
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`\\"
@@ -21893,6 +22142,9 @@
am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
CPP!$CPP$ac_delim
+PKG_CONFIG!$PKG_CONFIG$ac_delim
+Y2CORE_CFLAGS!$Y2CORE_CFLAGS$ac_delim
+Y2CORE_LIBS!$Y2CORE_LIBS$ac_delim
AGENT_LIBADD!$AGENT_LIBADD$ac_delim
SED!$SED$ac_delim
GREP!$GREP$ac_delim
@@ -21915,7 +22167,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 52; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 55; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-control-center-2.16.2/configure.in
new/yast2-control-center-2.17.2/configure.in
--- old/yast2-control-center-2.16.2/configure.in 2008-05-16
22:19:57.000000000 +0200
+++ new/yast2-control-center-2.17.2/configure.in 2008-10-29
15:21:07.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-control-center
dnl
-dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-control-center, 2.16.2, http://bugs.opensuse.org/,
yast2-control-center)
+AC_INIT(yast2-control-center, 2.17.2, http://bugs.opensuse.org/,
yast2-control-center)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.16.2"
+VERSION="2.17.2"
RPMNAME="yast2-control-center"
MAINTAINER="Stefan Hundhammer <sh@xxxxxxx>"
@@ -144,8 +144,14 @@
AC_PROG_CC
AC_PROG_CPP
-CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes"
-CXXFLAGS="${CXXFLAGS} -Wall -Wformat=2"
+# If we have core, get its Y2CORE_CFLAGS.
+# When building core itself, it has set Y2CORE_CFLAGS elsewhere already
+PKG_CHECK_EXISTS([yast2-core],[
+ PKG_CHECK_MODULES(Y2CORE, yast2-core)
+])
+
+CFLAGS="${CFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes"
+CXXFLAGS="${CXXFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2"
: ${AGENT_LIBADD:='-L$(libdir) -lscr'}
AC_SUBST(AGENT_LIBADD)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-control-center-2.16.2/Makefile.in
new/yast2-control-center-2.17.2/Makefile.in
--- old/yast2-control-center-2.16.2/Makefile.in 2008-05-16 22:20:09.000000000
+0200
+++ new/yast2-control-center-2.17.2/Makefile.in 2008-10-29 15:21:32.000000000
+0100
@@ -146,6 +146,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
QTDIR = @QTDIR@
QTLIBDIR = @QTLIBDIR@
@@ -163,6 +164,8 @@
VERSION = $(shell cat $(srcdir)/VERSION)
XGETTEXT = @XGETTEXT@
XMKMF = @XMKMF@
+Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
+Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YDOXYGEN = @YDOXYGEN@
abs_builddir = @abs_builddir@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-control-center-2.16.2/src/main.cpp
new/yast2-control-center-2.17.2/src/main.cpp
--- old/yast2-control-center-2.16.2/src/main.cpp 2008-04-29
16:48:11.000000000 +0200
+++ new/yast2-control-center-2.17.2/src/main.cpp 2008-10-29
15:19:23.000000000 +0100
@@ -96,7 +96,7 @@
y2cc.move( available.topLeft() );
}
else
- y2cc.resize( 680, 365 );
+ y2cc.resize( 680, 420 );
app.setMainWidget( &y2cc );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-control-center-2.16.2/src/Makefile.in
new/yast2-control-center-2.17.2/src/Makefile.in
--- old/yast2-control-center-2.16.2/src/Makefile.in 2008-05-16
22:20:09.000000000 +0200
+++ new/yast2-control-center-2.17.2/src/Makefile.in 2008-10-29
15:21:32.000000000 +0100
@@ -145,6 +145,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
QTDIR = @QTDIR@
QTLIBDIR = @QTLIBDIR@
@@ -162,6 +163,8 @@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
XMKMF = @XMKMF@
+Y2CORE_CFLAGS = @Y2CORE_CFLAGS@
+Y2CORE_LIBS = @Y2CORE_LIBS@
Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YDOXYGEN = @YDOXYGEN@
abs_builddir = @abs_builddir@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-control-center-2.16.2/VERSION
new/yast2-control-center-2.17.2/VERSION
--- old/yast2-control-center-2.16.2/VERSION 2008-04-30 13:58:19.000000000
+0200
+++ new/yast2-control-center-2.17.2/VERSION 2008-10-29 15:20:15.000000000
+0100
@@ -1 +1 @@
-2.16.2
+2.17.2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |