Hello community,
here is the log from the commit of package yast2-schema
checked in at Mon Oct 30 17:56:12 CET 2006.
--------
--- yast2-schema/yast2-schema.changes 2006-02-23 16:43:05.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-schema/yast2-schema.changes 2006-10-30 09:53:36.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Oct 30 09:53:03 CET 2006 - mvidner@suse.cz
+
+- Fixed too aggressive escaping which broke on files-with-dashes.rnc
+- 2.13.3
+
+-------------------------------------------------------------------
Old:
----
yast2-schema-2.13.2.tar.bz2
New:
----
yast2-schema-2.13.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-schema.spec ++++++
--- /var/tmp/diff_new_pack.OmW5fn/_old 2006-10-30 17:54:44.000000000 +0100
+++ /var/tmp/diff_new_pack.OmW5fn/_new 2006-10-30 17:54:44.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-schema (Version 2.13.2)
+# spec file for package yast2-schema (Version 2.13.3)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-schema
URL: http://www.suse.com/
-Version: 2.13.2
+Version: 2.13.3
Release: 1
-License: GPL
+License: GNU General Public License (GPL) - all versions
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-schema-2.13.2.tar.bz2
+Source0: yast2-schema-2.13.3.tar.bz2
prefix: /usr
BuildRequires: java2-devel-packages trang yast2-all-packages
#!BuildIgnore: yast2-build-test yast2-online-update
@@ -35,7 +35,7 @@
Martin Vidner
%prep
-%setup -n yast2-schema-2.13.2
+%setup -n yast2-schema-2.13.3
%build
%{prefix}/bin/y2tool y2autoconf
@@ -69,6 +69,9 @@
%doc %{prefix}/share/doc/packages/yast2-schema
%changelog -n yast2-schema
+* Mon Oct 30 2006 - mvidner@suse.cz
+- Fixed too aggressive escaping which broke on files-with-dashes.rnc
+- 2.13.3
* Thu Feb 23 2006 - mvidner@suse.cz
- converted neededforbuild to BuildRequires (mls)
- broke a build cycle with yast2-online-update (ro)
++++++ yast2-schema-2.13.2.tar.bz2 -> yast2-schema-2.13.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-schema-2.13.2/Makefile.am new/yast2-schema-2.13.3/Makefile.am
--- old/yast2-schema-2.13.2/Makefile.am 2006-02-23 16:44:25.000000000 +0100
+++ new/yast2-schema-2.13.3/Makefile.am 2006-10-30 10:01:47.000000000 +0100
@@ -7,7 +7,7 @@
#
#where devtools are
-PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
+Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -19,7 +19,7 @@
# do we do Makefile.am for devtools? It is a little special...
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
-DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools)
+DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
@@ -33,7 +33,7 @@
AUTOMAKE_OPTIONS = foreign dist-bzip2
# where devtools instal m4 snippets
# argh, executed literally
-#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal
+#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
@@ -66,7 +66,7 @@
# because the prerequisite is made here (not anymore!)
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
-$(RPMNAME).pc: $(RPMNAME).pc.in
+$(RPMNAME).pc: $(RPMNAME).pc.in config.status
./config.status --file=$@:$<
if CREATE_PKGCONFIG_NOARCH
@@ -95,7 +95,7 @@
done
pot:
- y2tool y2makepot -s $(srcdir)
+ $(Y2TOOL) y2makepot -s $(srcdir)
install-pot: pot
@POT_DST=`find -type d -name testsuite -prune , \
@@ -116,7 +116,7 @@
fi
spellcheck: pot
- y2tool pot-spellcheck
+ $(Y2TOOL) pot-spellcheck
# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))
@@ -143,20 +143,20 @@
rm -f package/*.bak
rm -f package/*.auto
mv $(RPMNAME)-$(VERSION).tar.bz2 package/
- if ! test -x $(PREFIX)/bin/y2tool; then \
- echo "$(PREFIX)/bin/y2tool: not found."; \
+ if ! test -x $(Y2TOOL); then \
+ echo "$(Y2TOOL): not found."; \
echo "You have to install yast2-devtools to making a package"; \
false; \
fi
here=`pwd`; \
cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \
newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
- $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
+ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages package-local
+package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
-TAGVERSION = $(PREFIX)/bin/y2tool tagversion
+TAGVERSION = $(Y2TOOL) tagversion
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -199,10 +199,13 @@
false; \
fi
+check-textdomain:
+ $(Y2TOOL) check-textdomain $(srcdir)
+
stable: checkin-stable
checkin-stable: package
- $(PREFIX)/bin/y2tool checkin-stable
+ $(Y2TOOL) checkin-stable
# For po/ modules
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-schema-2.13.2/Makefile.in new/yast2-schema-2.13.3/Makefile.in
--- old/yast2-schema-2.13.2/Makefile.in 2006-02-23 16:44:40.000000000 +0100
+++ new/yast2-schema-2.13.3/Makefile.in 2006-10-30 10:01:58.000000000 +0100
@@ -135,6 +135,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = $(shell cat $(srcdir)/VERSION)
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
@@ -197,14 +198,14 @@
ystartupdir = @ystartupdir@
#where devtools are
-PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
+Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool
SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS)
ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4)
HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE)
# do we do Makefile.am for devtools? It is a little special...
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
-DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools)
+DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english
@@ -215,7 +216,7 @@
AUTOMAKE_OPTIONS = foreign dist-bzip2
# where devtools instal m4 snippets
# argh, executed literally
-#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal
+#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
CLEANFILES =
MAINTAINERCLEANFILES = package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec
@@ -227,7 +228,7 @@
$(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) $(am__append_1)
@CREATE_PKGCONFIG_NOARCH_TRUE@@CREATE_PKGCONFIG_TRUE@pkgconfigdata_DATA = $(RPMNAME).pc
@CREATE_PKGCONFIG_NOARCH_FALSE@@CREATE_PKGCONFIG_TRUE@pkgconfig_DATA = $(RPMNAME).pc
-TAGVERSION = $(PREFIX)/bin/y2tool tagversion
+TAGVERSION = $(Y2TOOL) tagversion
# test ! -d $(srcdir)/po \
# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; }
# Contents of ./SUBDIRS
@@ -704,7 +705,7 @@
# because the prerequisite is made here (not anymore!)
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
-@CREATE_PKGCONFIG_TRUE@$(RPMNAME).pc: $(RPMNAME).pc.in
+@CREATE_PKGCONFIG_TRUE@$(RPMNAME).pc: $(RPMNAME).pc.in config.status
@CREATE_PKGCONFIG_TRUE@ ./config.status --file=$@:$<
dist-hook:
@@ -724,7 +725,7 @@
done
pot:
- y2tool y2makepot -s $(srcdir)
+ $(Y2TOOL) y2makepot -s $(srcdir)
install-pot: pot
@POT_DST=`find -type d -name testsuite -prune , \
@@ -745,7 +746,7 @@
fi
spellcheck: pot
- y2tool pot-spellcheck
+ $(Y2TOOL) pot-spellcheck
# all-local: $(if $(IS_DEVTOOLS),,$(POT_DST))
@@ -772,18 +773,18 @@
rm -f package/*.bak
rm -f package/*.auto
mv $(RPMNAME)-$(VERSION).tar.bz2 package/
- if ! test -x $(PREFIX)/bin/y2tool; then \
- echo "$(PREFIX)/bin/y2tool: not found."; \
+ if ! test -x $(Y2TOOL); then \
+ echo "$(Y2TOOL): not found."; \
echo "You have to install yast2-devtools to making a package"; \
false; \
fi
here=`pwd`; \
cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \
newname="`echo "$$i" | sed "s/\.in$$//g"`"; \
- $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \
+ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages package-local
+package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -826,10 +827,13 @@
false; \
fi
+check-textdomain:
+ $(Y2TOOL) check-textdomain $(srcdir)
+
stable: checkin-stable
checkin-stable: package
- $(PREFIX)/bin/y2tool checkin-stable
+ $(Y2TOOL) checkin-stable
# For po/ modules
checkpo:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-schema-2.13.2/VERSION new/yast2-schema-2.13.3/VERSION
--- old/yast2-schema-2.13.2/VERSION 2006-02-23 16:16:54.000000000 +0100
+++ new/yast2-schema-2.13.3/VERSION 2006-10-30 09:51:47.000000000 +0100
@@ -1 +1 @@
-2.13.2
+2.13.3
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-schema-2.13.2/configure new/yast2-schema-2.13.3/configure
--- old/yast2-schema-2.13.2/configure 2006-02-23 16:44:34.000000000 +0100
+++ new/yast2-schema-2.13.3/configure 2006-10-30 10:01:54.000000000 +0100
@@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-schema 2.13.2.
+# Generated by GNU Autoconf 2.59 for yast2-schema 2.13.3.
#
-# Report bugs to http://www.suse.de/feedback.
+# Report bugs to http://bugs.opensuse.org/.
#
# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
@@ -269,13 +269,13 @@
# Identity of this package.
PACKAGE_NAME='yast2-schema'
PACKAGE_TARNAME='yast2-schema'
-PACKAGE_VERSION='2.13.2'
-PACKAGE_STRING='yast2-schema 2.13.2'
-PACKAGE_BUGREPORT='http://www.suse.de/feedback'
+PACKAGE_VERSION='2.13.3'
+PACKAGE_STRING='yast2-schema 2.13.3'
+PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
ac_default_prefix=/usr
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar RPMNAME MAINTAINER pkgconfigdir pkgconfigdatadir yast2dir ybindir ystartupdir plugindir potdir execcompdir docdir ydatadir imagedir themedir localedir clientdir moduledir yncludedir schemadir scrconfdir agentdir desktopdir fillupdir LN_S PKG_CONFIG_PATH XGETTEXT CREATE_PKGCONFIG_TRUE CREATE_PKGCONFIG_F
ALSE CREATE_PKGCONFIG_NOARCH_TRUE CREATE_PKGCONFIG_NOARCH_FALSE STYLESHEET_HTML STYLESHEET_PDF STYLESHEET_CSS STYLESHEET_YDOC STYLESHEET_YCPDOC YCPDOC YCPMAKEDEP YCPC LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar RPMNAME MAINTAINER pkgconfigdir pkgconfigdatadir yast2dir ybindir ystartupdir plugindir potdir execcompdir docdir ydatadir imagedir themedir localedir clientdir moduledir yncludedir schemadir scrconfdir agentdir desktopdir fillupdir LN_S PKG_CONFIG_PATH XGETTEXT Y2DEVTOOLS_PREFIX CREATE_PKGCONFIG_TRUE
CREATE_PKGCONFIG_FALSE CREATE_PKGCONFIG_NOARCH_TRUE CREATE_PKGCONFIG_NOARCH_FALSE STYLESHEET_HTML STYLESHEET_PDF STYLESHEET_CSS STYLESHEET_YDOC STYLESHEET_YCPDOC YCPDOC YCPMAKEDEP YCPC LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -728,7 +728,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-schema 2.13.2 to adapt to many kinds of systems.
+\`configure' configures yast2-schema 2.13.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-schema 2.13.2:";;
+ short | recursive ) echo "Configuration of yast2-schema 2.13.3:";;
esac
cat <<\_ACEOF
@@ -812,7 +812,7 @@
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-Report bugs to http://www.suse.de/feedback.
+Report bugs to http://bugs.opensuse.org/.
_ACEOF
fi
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-schema configure 2.13.2
+yast2-schema configure 2.13.3
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,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-schema $as_me 2.13.2, which was
+It was created by yast2-schema $as_me 2.13.3, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-schema'
- VERSION='2.13.2'
+ VERSION='2.13.3'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.2"
+VERSION="2.13.3"
RPMNAME="yast2-schema"
MAINTAINER="Martin Vidner "
@@ -2107,6 +2107,8 @@
{ (exit 1); exit 1; }; }
fi
+Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
+
devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
@@ -2282,6 +2284,33 @@
echo "$as_me: error: ycpc is not installed" >&2;}
{ (exit 1); exit 1; }; }
fi
+as_ac_File=`echo "ac_cv_file_$devtools_yast2dir/data/testsuite/Makefile.testsuite" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $devtools_yast2dir/data/testsuite/Makefile.testsuite" >&5
+echo $ECHO_N "checking for $devtools_yast2dir/data/testsuite/Makefile.testsuite... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ test "$cross_compiling" = yes &&
+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+if test -r "$devtools_yast2dir/data/testsuite/Makefile.testsuite"; then
+ eval "$as_ac_File=yes"
+else
+ eval "$as_ac_File=no"
+fi
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+if test `eval echo '${'$as_ac_File'}'` = yes; then
+ :
+else
+
+ { echo "$as_me:$LINENO: WARNING: yast2-testsuite.rpm is not installed" >&5
+echo "$as_me: WARNING: yast2-testsuite.rpm is not installed" >&2;}
+
+fi
+
ac_config_files="$ac_config_files Makefile scripts/Makefile src/rnc/Makefile src/rng/Makefile src/Makefile doc/Makefile testsuite/Makefile"
@@ -2693,7 +2722,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-schema $as_me 2.13.2, which was
+This file was extended by yast2-schema $as_me 2.13.3, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2748,7 +2777,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-schema config.status 2.13.2
+yast2-schema config.status 2.13.3
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -3001,6 +3030,7 @@
s,@LN_S@,$LN_S,;t t
s,@PKG_CONFIG_PATH@,$PKG_CONFIG_PATH,;t t
s,@XGETTEXT@,$XGETTEXT,;t t
+s,@Y2DEVTOOLS_PREFIX@,$Y2DEVTOOLS_PREFIX,;t t
s,@CREATE_PKGCONFIG_TRUE@,$CREATE_PKGCONFIG_TRUE,;t t
s,@CREATE_PKGCONFIG_FALSE@,$CREATE_PKGCONFIG_FALSE,;t t
s,@CREATE_PKGCONFIG_NOARCH_TRUE@,$CREATE_PKGCONFIG_NOARCH_TRUE,;t t
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-schema-2.13.2/configure.in new/yast2-schema-2.13.3/configure.in
--- old/yast2-schema-2.13.2/configure.in 2006-02-23 16:44:24.000000000 +0100
+++ new/yast2-schema-2.13.3/configure.in 2006-10-30 10:01:47.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-schema
dnl
-dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.29 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-schema, 2.13.2, http://www.suse.de/feedback, yast2-schema)
+AC_INIT(yast2-schema, 2.13.3, http://bugs.opensuse.org/, yast2-schema)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.2"
+VERSION="2.13.3"
RPMNAME="yast2-schema"
MAINTAINER="Martin Vidner "
@@ -110,6 +110,8 @@
AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi
+Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
+AC_SUBST(Y2DEVTOOLS_PREFIX)
devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
@@ -142,6 +144,9 @@
if test "$YCPC" = "false"; then
AC_MSG_ERROR([ycpc is not installed])
fi
+AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [
+ AC_MSG_WARN([yast2-testsuite.rpm is not installed])
+])
AC_CONFIG_FILES(Makefile scripts/Makefile
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-schema-2.13.2/doc/Makefile.in new/yast2-schema-2.13.3/doc/Makefile.in
--- old/yast2-schema-2.13.2/doc/Makefile.in 2006-02-23 16:44:37.000000000 +0100
+++ new/yast2-schema-2.13.3/doc/Makefile.in 2006-10-30 10:01:56.000000000 +0100
@@ -104,6 +104,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-schema-2.13.2/scripts/Makefile.in new/yast2-schema-2.13.3/scripts/Makefile.in
--- old/yast2-schema-2.13.2/scripts/Makefile.in 2006-02-23 16:44:37.000000000 +0100
+++ new/yast2-schema-2.13.3/scripts/Makefile.in 2006-10-30 10:01:56.000000000 +0100
@@ -93,6 +93,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-schema-2.13.2/scripts/collect.sh new/yast2-schema-2.13.3/scripts/collect.sh
--- old/yast2-schema-2.13.2/scripts/collect.sh 2005-09-23 15:16:26.000000000 +0200
+++ new/yast2-schema-2.13.3/scripts/collect.sh 2006-10-30 09:51:15.000000000 +0100
@@ -31,7 +31,7 @@
unset X_SuSE_YaST_AutoInstPath
unset X_SuSE_YaST_AutoInstOptional
- eval $(grep "^X-SuSE-YaST" $desktop | sed -e 's/-/_/g' )
+ eval $(grep "^X-SuSE-YaST" $desktop | sed -e 's/X-SuSE-YaST-/X_SuSE_YaST_/' )
if [ -z "$X_SuSE_YaST_AutoInstResource" ]; then
resource=`basename $desktop .desktop`
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-schema-2.13.2/src/Makefile.in new/yast2-schema-2.13.3/src/Makefile.in
--- old/yast2-schema-2.13.2/src/Makefile.in 2006-02-23 16:44:38.000000000 +0100
+++ new/yast2-schema-2.13.3/src/Makefile.in 2006-10-30 10:01:57.000000000 +0100
@@ -112,6 +112,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-schema-2.13.2/src/rnc/Makefile.in new/yast2-schema-2.13.3/src/rnc/Makefile.in
--- old/yast2-schema-2.13.2/src/rnc/Makefile.in 2006-02-23 16:44:38.000000000 +0100
+++ new/yast2-schema-2.13.3/src/rnc/Makefile.in 2006-10-30 10:01:57.000000000 +0100
@@ -105,6 +105,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-schema-2.13.2/src/rng/Makefile.in new/yast2-schema-2.13.3/src/rng/Makefile.in
--- old/yast2-schema-2.13.2/src/rng/Makefile.in 2006-02-23 16:44:39.000000000 +0100
+++ new/yast2-schema-2.13.3/src/rng/Makefile.in 2006-10-30 10:01:57.000000000 +0100
@@ -93,6 +93,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-schema-2.13.2/testsuite/Makefile.in new/yast2-schema-2.13.3/testsuite/Makefile.in
--- old/yast2-schema-2.13.2/testsuite/Makefile.in 2006-02-23 16:44:39.000000000 +0100
+++ new/yast2-schema-2.13.3/testsuite/Makefile.in 2006-10-30 10:01:57.000000000 +0100
@@ -101,6 +101,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YCPC = @YCPC@
YCPDOC = @YCPDOC@
YCPMAKEDEP = @YCPMAKEDEP@
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org