Hello community, here is the log from the commit of package yast2-runlevel for openSUSE:Factory checked in at 2013-10-06 14:35:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-runlevel (Old) and /work/SRC/openSUSE:Factory/.yast2-runlevel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-runlevel" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-runlevel/yast2-runlevel.changes 2013-08-01 11:09:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-runlevel.new/yast2-runlevel.changes 2013-10-06 14:35:25.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Oct 4 13:46:32 UTC 2013 - [email protected] + +- Fix runlevel proposal for minimal X (BNC#837450) +- 3.0.1 + +------------------------------------------------------------------- Old: ---- yast2-runlevel-3.0.0.tar.bz2 New: ---- yast2-runlevel-3.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-runlevel.spec ++++++ --- /var/tmp/diff_new_pack.8zENtO/_old 2013-10-06 14:35:26.000000000 +0200 +++ /var/tmp/diff_new_pack.8zENtO/_new 2013-10-06 14:35:26.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-runlevel -Version: 3.0.0 +Version: 3.0.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-runlevel-3.0.0.tar.bz2 -> yast2-runlevel-3.0.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-runlevel-3.0.0/Makefile.am.common new/yast2-runlevel-3.0.1/Makefile.am.common --- old/yast2-runlevel-3.0.0/Makefile.am.common 2013-07-31 12:24:25.000000000 +0200 +++ new/yast2-runlevel-3.0.1/Makefile.am.common 2013-10-04 16:06:19.000000000 +0200 @@ -15,6 +15,7 @@ CLEANFILES = ${ybcfiles} DISTCLEANFILES = .dep +if HAS_YCP_MODULES # Needs to be outside "." because of cases # where ycpchook contains a symlink to "." # Otherwise "." keeps being newer than .dep and we loop. @@ -26,14 +27,16 @@ ${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} > ${NEWDEP} cat ${NEWDEP} > .dep rm ${NEWDEP} +-include .dep +endif dist-hook: check-syntax CHECK_SYNTAX = true -check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(filter %.ycp,client_DATA)"; then \ +check-syntax: $(client_DATA) $(module_DATA) $(ynclude_DATA) $(ydata_DATA) $(ycpchook) $(ybcfiles) + @if test "$(filter %.ycp, $(client_DATA) $(ydata_DATA))"; then \ if $(CHECK_SYNTAX); then \ - TO_CHECK="$(filter %.ycp,$^)"; \ + TO_CHECK="$(filter %.ycp, $(client_DATA) $(ydata_DATA))"; \ echo "Checking syntax of $${TO_CHECK}"; \ if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ @@ -43,5 +46,18 @@ echo "Syntax check disabled"; \ fi; \ fi + @if test "$(filter %.rb, $^)"; then \ + if $(CHECK_SYNTAX); then \ + TO_CHECK="$(filter %.rb, $^)"; \ + echo "Checking syntax of $${TO_CHECK}"; \ + for f in $${TO_CHECK}; do \ + if ! ruby -c $$f > /dev/null; then \ + echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ + exit 1; \ + fi; \ + done; \ + else \ + echo "Syntax check disabled"; \ + fi; \ + fi --include .dep diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-runlevel-3.0.0/Makefile.in new/yast2-runlevel-3.0.1/Makefile.in --- old/yast2-runlevel-3.0.0/Makefile.in 2013-07-31 12:24:31.000000000 +0200 +++ new/yast2-runlevel-3.0.1/Makefile.in 2013-10-04 16:06:25.000000000 +0200 @@ -686,7 +686,7 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod u+w $(distdir) + chmod -R a-w $(distdir); chmod a+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-runlevel-3.0.0/VERSION new/yast2-runlevel-3.0.1/VERSION --- old/yast2-runlevel-3.0.0/VERSION 2013-07-30 13:40:11.000000000 +0200 +++ new/yast2-runlevel-3.0.1/VERSION 2013-10-04 16:06:00.000000000 +0200 @@ -1 +1 @@ -3.0.0 +3.0.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-runlevel-3.0.0/configure new/yast2-runlevel-3.0.1/configure --- old/yast2-runlevel-3.0.0/configure 2013-07-31 12:24:30.000000000 +0200 +++ new/yast2-runlevel-3.0.1/configure 2013-10-04 16:06:23.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for yast2-runlevel 3.0.0. +# Generated by GNU Autoconf 2.69 for yast2-runlevel 3.0.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='yast2-runlevel' PACKAGE_TARNAME='yast2-runlevel' -PACKAGE_VERSION='3.0.0' -PACKAGE_STRING='yast2-runlevel 3.0.0' +PACKAGE_VERSION='3.0.1' +PACKAGE_STRING='yast2-runlevel 3.0.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -590,6 +590,8 @@ LIBOBJS MYRUNTEST MYEXPECT +HAS_YCP_MODULES_FALSE +HAS_YCP_MODULES_TRUE YCPC YCPMAKEDEP YCPDOC @@ -1249,7 +1251,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-runlevel 3.0.0 to adapt to many kinds of systems. +\`configure' configures yast2-runlevel 3.0.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1320,7 +1322,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-runlevel 3.0.0:";; + short | recursive ) echo "Configuration of yast2-runlevel 3.0.1:";; esac cat <<\_ACEOF @@ -1400,7 +1402,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-runlevel configure 3.0.0 +yast2-runlevel configure 3.0.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1417,7 +1419,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-runlevel $as_me 3.0.0, which was +It was created by yast2-runlevel $as_me 3.0.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2356,7 +2358,7 @@ # Define the identity of the package. PACKAGE='yast2-runlevel' - VERSION='3.0.0' + VERSION='3.0.1' cat >>confdefs.h <<_ACEOF @@ -2479,7 +2481,7 @@ -VERSION="3.0.0" +VERSION="3.0.1" RPMNAME="yast2-runlevel" MAINTAINER="Martin Vidner <[email protected]>" @@ -2843,6 +2845,29 @@ fi +# handle .dep files in Makefile.am.common if any YCP module is present +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for YCP modules" >&5 +$as_echo_n "checking for YCP modules... " >&6; } + +# YCP module file name starts with an upper case letter +find . -type f | grep -q "[[:upper:]][^/]*\.ycp$" && has_ycp_modules=1 + if test -n "$has_ycp_modules"; then + HAS_YCP_MODULES_TRUE= + HAS_YCP_MODULES_FALSE='#' +else + HAS_YCP_MODULES_TRUE='#' + HAS_YCP_MODULES_FALSE= +fi + + +if test -n "$has_ycp_modules"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 +$as_echo "found" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } +fi + # Extract the first word of "expect", so it can be a program name with args. set dummy expect; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -3097,6 +3122,10 @@ as_fn_error $? "conditional \"CREATE_PKGCONFIG_NOARCH\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAS_YCP_MODULES_TRUE}" && test -z "${HAS_YCP_MODULES_FALSE}"; then + as_fn_error $? "conditional \"HAS_YCP_MODULES\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -3494,7 +3523,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-runlevel $as_me 3.0.0, which was +This file was extended by yast2-runlevel $as_me 3.0.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3547,7 +3576,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-runlevel config.status 3.0.0 +yast2-runlevel config.status 3.0.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-runlevel-3.0.0/configure.ac new/yast2-runlevel-3.0.1/configure.ac --- old/yast2-runlevel-3.0.0/configure.ac 2013-07-31 12:24:25.000000000 +0200 +++ new/yast2-runlevel-3.0.1/configure.ac 2013-10-04 16:06:18.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.ac for yast2-runlevel dnl -dnl -- This file is generated by y2autoconf 2.24.7 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 3.0.4 - DO NOT EDIT! -- dnl (edit configure.ac.in or configure.in.in instead) -AC_INIT(yast2-runlevel, 3.0.0, http://bugs.opensuse.org/, yast2-runlevel) +AC_INIT(yast2-runlevel, 3.0.1, http://bugs.opensuse.org/, yast2-runlevel) 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="3.0.0" +VERSION="3.0.1" RPMNAME="yast2-runlevel" MAINTAINER="Martin Vidner <[email protected]>" @@ -149,6 +149,19 @@ AC_MSG_WARN([yast2-testsuite.rpm is not installed]) ]) +# handle .dep files in Makefile.am.common if any YCP module is present +AC_MSG_CHECKING([for YCP modules]) + +# YCP module file name starts with an upper case letter +[find . -type f | grep -q "[[:upper:]][^/]*\.ycp$" && has_ycp_modules=1] +AM_CONDITIONAL([HAS_YCP_MODULES], [test -n "$has_ycp_modules"]) + +if test -n "$has_ycp_modules"; then + AC_MSG_RESULT([found]) +else + AC_MSG_RESULT([not found]) +fi + dnl Check packages expect and dejagnu AC_PATH_PROG(MYEXPECT, expect, false) if test "$MYEXPECT" = "false"; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-runlevel-3.0.0/src/Makefile.in new/yast2-runlevel-3.0.1/src/Makefile.in --- old/yast2-runlevel-3.0.0/src/Makefile.in 2013-07-31 12:24:31.000000000 +0200 +++ new/yast2-runlevel-3.0.1/src/Makefile.in 2013-10-04 16:06:25.000000000 +0200 @@ -263,7 +263,7 @@ # Needs to be outside "." because of cases # where ycpchook contains a symlink to "." # Otherwise "." keeps being newer than .dep and we loop. -NEWDEP = ${top_builddir}/.dep.new +@HAS_YCP_MODULES_TRUE@NEWDEP = ${top_builddir}/.dep.new CHECK_SYNTAX = true all: all-am @@ -626,16 +626,17 @@ # generate dependencies # two steps not to lose the file if the command fails # hook: create the links before we look for files -.dep: $(wildcard *.ycp) ${ycpchook} - ${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} > ${NEWDEP} - cat ${NEWDEP} > .dep - rm ${NEWDEP} +@[email protected]: $(wildcard *.ycp) ${ycpchook} +@HAS_YCP_MODULES_TRUE@ ${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} > ${NEWDEP} +@HAS_YCP_MODULES_TRUE@ cat ${NEWDEP} > .dep +@HAS_YCP_MODULES_TRUE@ rm ${NEWDEP} +@HAS_YCP_MODULES_TRUE@-include .dep dist-hook: check-syntax -check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(filter %.ycp,client_DATA)"; then \ +check-syntax: $(client_DATA) $(module_DATA) $(ynclude_DATA) $(ydata_DATA) $(ycpchook) $(ybcfiles) + @if test "$(filter %.ycp, $(client_DATA) $(ydata_DATA))"; then \ if $(CHECK_SYNTAX); then \ - TO_CHECK="$(filter %.ycp,$^)"; \ + TO_CHECK="$(filter %.ycp, $(client_DATA) $(ydata_DATA))"; \ echo "Checking syntax of $${TO_CHECK}"; \ if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ @@ -645,8 +646,20 @@ echo "Syntax check disabled"; \ fi; \ fi - --include .dep + @if test "$(filter %.rb, $^)"; then \ + if $(CHECK_SYNTAX); then \ + TO_CHECK="$(filter %.rb, $^)"; \ + echo "Checking syntax of $${TO_CHECK}"; \ + for f in $${TO_CHECK}; do \ + if ! ruby -c $$f > /dev/null; then \ + echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ + exit 1; \ + fi; \ + done; \ + else \ + echo "Syntax check disabled"; \ + fi; \ + fi # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-runlevel-3.0.0/src/clients/runlevel_proposal.rb new/yast2-runlevel-3.0.1/src/clients/runlevel_proposal.rb --- old/yast2-runlevel-3.0.0/src/clients/runlevel_proposal.rb 2013-07-30 13:40:11.000000000 +0200 +++ new/yast2-runlevel-3.0.1/src/clients/runlevel_proposal.rb 2013-10-04 16:06:00.000000000 +0200 @@ -44,7 +44,7 @@ # find out proposal parameters, ie. what it depends on # some architectures don't have X at all @x11_needed = Arch.x11_setup_needed # constant - @x11_selected = Pkg.IsSelected("xorg-x11") # variable + @x11_selected = Pkg.IsSelected("xorg-x11-server") # variable @live_medium = Mode.live_installation # But if we install over VNC, we want RL 5 (and kdm) even though # there's no X. -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
