Hello community, here is the log from the commit of package yast2-schema for openSUSE:Factory checked in at 2012-05-03 11:01:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-schema (Old) and /work/SRC/openSUSE:Factory/.yast2-schema.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-schema", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-schema/yast2-schema.changes 2011-09-23 12:53:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-schema.new/yast2-schema.changes 2012-05-03 11:02:20.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Apr 24 16:00:17 CEST 2012 - [email protected] + +- fix for pxe.rnc from the autoyast package +- 2.22.0 + +------------------------------------------------------------------- +Tue Apr 24 15:41:04 CEST 2012 - [email protected] + +- added yast2-online-update-configuration to + BUILDREQUIRES + +------------------------------------------------------------------- Old: ---- yast2-schema-2.18.2.tar.bz2 New: ---- yast2-schema-2.22.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-schema.spec ++++++ --- /var/tmp/diff_new_pack.1Q29rK/_old 2012-05-03 11:02:24.000000000 +0200 +++ /var/tmp/diff_new_pack.1Q29rK/_new 2012-05-03 11:02:24.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package yast2-schema (Version 2.18.2) +# spec file for package yast2-schema # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,53 +19,69 @@ Name: yast2-schema -Version: 2.18.2 -Release: 1 +Version: 2.22.0 +Release: 0 + BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-schema-2.18.2.tar.bz2 -Prefix: /usr +Source0: yast2-schema-%{version}.tar.bz2 + Group: System/YaST License: GPL-2.0+ + +# FIXME: drop yast2-all-packages some day BuildRequires: java2-devel-packages trang yast2-all-packages + +# not covered by yast2-all-packages +BuildRequires: yast2-online-update-configuration + # yast2-core omited from some reason in buildservice, adding explicitly BuildRequires: yast2-core #!BuildIgnore: yast2-build-test yast2-online-update + # optimization suggested by AJ: #!BuildIgnore: tomcat5 + # ignoring conflicting packages #!BuildIgnore: yast2-branding-SLED yast2-branding-openSUSE #!BuildIgnore: yast2-theme yast2-theme-SLED yast2-theme-openSUSE yast2-theme-SLE + # Hotfix to build a package, bnc #427684 #!BuildIgnore: xerces-j2-bootstrap libusb-0_1-4 crimson + # Just a S390 thingie #!BuildIgnore: yast2-reipl + # To speedup && to easily recover from dependency hell #!BuildIgnore: yast2-pkg-bindings-devel-doc yast2-pkg-bindings zypper libzypp yast2-gtk yast2-qt yast2-ncurses yast2-qt-pkg yast2-ncurses-pkg + BuildArch: noarch + Summary: YaST2 - AutoYaST Schema %description AutoYaST Syntax Schema %prep -%setup -n yast2-schema-2.18.2 +%setup -n yast2-schema-%{version} %build -%{prefix}/bin/y2tool y2autoconf -%{prefix}/bin/y2tool y2automake +%{_prefix}/bin/y2tool y2autoconf +%{_prefix}/bin/y2tool y2automake autoreconf --force --install + export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" + %{?suse_update_config:%{suse_update_config -f}} -./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} +./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) # so that RPM_OPT_FLAGS check works make %{?jobs:-j%jobs} V=1 %install make install DESTDIR="$RPM_BUILD_ROOT" -[ -e "%{prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" -for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desktop"` ; do +[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" +for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do d=${f##*/} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done @@ -80,5 +96,6 @@ /usr/share/YaST2/schema/autoyast/rnc/includes.rnc %dir /usr/share/YaST2/schema/autoyast/rng /usr/share/YaST2/schema/autoyast/rng/*.rng -%doc %{prefix}/share/doc/packages/yast2-schema +%doc %{_prefix}/share/doc/packages/yast2-schema + %changelog ++++++ yast2-schema-2.18.2.tar.bz2 -> yast2-schema-2.22.0.tar.bz2 ++++++ ++++ 4393 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-schema-2.18.2/Makefile.am new/yast2-schema-2.22.0/Makefile.am --- old/yast2-schema-2.18.2/Makefile.am 2009-09-08 10:27:10.000000000 +0200 +++ new/yast2-schema-2.22.0/Makefile.am 2012-04-24 16:11:37.000000000 +0200 @@ -20,7 +20,6 @@ IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) 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 @@ -155,7 +154,7 @@ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local +package: check-up-to-date check-tagversion check-textdomain package-local TAGVERSION = $(Y2TOOL) tagversion @@ -185,21 +184,6 @@ check-parse: @echo "Not running parseycp." -check-all-packages: - @if [ ! -e "$(ALL_PACKAGES)" ]; then \ - echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \ - fi - @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \ - fi - @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some unknown (?) fields:"; \ - echo; \ - grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \ - echo; \ - false; \ - fi - check-textdomain: $(Y2TOOL) check-textdomain $(srcdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-schema-2.18.2/VERSION new/yast2-schema-2.22.0/VERSION --- old/yast2-schema-2.18.2/VERSION 2009-09-08 10:21:52.000000000 +0200 +++ new/yast2-schema-2.22.0/VERSION 2012-04-24 16:11:20.000000000 +0200 @@ -1 +1 @@ -2.18.2 +2.22.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-schema-2.18.2/configure.in new/yast2-schema-2.22.0/configure.in --- old/yast2-schema-2.18.2/configure.in 2009-09-08 10:27:10.000000000 +0200 +++ new/yast2-schema-2.22.0/configure.in 2012-04-24 16:11:37.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-schema dnl -dnl -- This file is generated by y2autoconf 2.18.10 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.21.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-schema, 2.18.2, http://bugs.opensuse.org/, yast2-schema) +AC_INIT(yast2-schema, 2.22.0, http://bugs.opensuse.org/, yast2-schema) 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.18.2" +VERSION="2.22.0" RPMNAME="yast2-schema" MAINTAINER="Martin Vidner <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-schema-2.18.2/scripts/collect.sh new/yast2-schema-2.22.0/scripts/collect.sh --- old/yast2-schema-2.18.2/scripts/collect.sh 2009-09-08 09:55:51.000000000 +0200 +++ new/yast2-schema-2.22.0/scripts/collect.sh 2012-04-24 16:09:57.000000000 +0200 @@ -45,6 +45,13 @@ resource="user_defaults? & groups? & login_settings? & users" fi + # same hack as for users. pxe.rnc is part of autoyast but has no client + if [ "$resource" = "general" ]; then + resource="general? & pxe" + cp $SCHEMA_DIR/pxe.rnc $RNC_OUTPUT + echo "include 'pxe.rnc'" >> $RNC_OUTPUT/includes.rnc + fi + if [ ! -z "${X_SuSE_YaST_AutoInstSchema}" ]; then cp $SCHEMA_DIR/${X_SuSE_YaST_AutoInstSchema} $RNC_OUTPUT -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
