Hello community, here is the log from the commit of package yast2-inetd for openSUSE:Factory checked in at 2013-05-02 12:08:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-inetd (Old) and /work/SRC/openSUSE:Factory/.yast2-inetd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-inetd" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-inetd/yast2-inetd.changes 2013-01-17 13:18:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-inetd.new/yast2-inetd.changes 2013-05-02 12:08:10.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 22 10:25:04 CEST 2013 - [email protected] + +- testsuite adapted to last change of Service.ycp +- 2.21.5 + +------------------------------------------------------------------- Old: ---- yast2-inetd-2.21.4.tar.bz2 New: ---- yast2-inetd-2.21.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-inetd.spec ++++++ --- /var/tmp/diff_new_pack.Og7KYi/_old 2013-05-02 12:08:11.000000000 +0200 +++ /var/tmp/diff_new_pack.Og7KYi/_new 2013-05-02 12:08:11.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-inetd -Version: 2.21.4 +Version: 2.21.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-inetd-2.21.4.tar.bz2 -> yast2-inetd-2.21.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-inetd-2.21.4/Makefile.am new/yast2-inetd-2.21.5/Makefile.am --- old/yast2-inetd-2.21.4/Makefile.am 2013-01-16 15:47:00.000000000 +0100 +++ new/yast2-inetd-2.21.5/Makefile.am 2013-04-30 14:06:25.000000000 +0200 @@ -158,19 +158,14 @@ TAGVERSION = $(Y2TOOL) tagversion -check-up-to-date check-cvs-up-to-date check-svn-up-to-date: - if [ -d $(srcdir)/CVS ]; then \ - cd $(srcdir) && ! cvs -q -n up 2>/dev/null | grep '^[MCAR] ';\ - else \ - cd $(srcdir) && ! LC_ALL=C svn status --show-updates --quiet | grep -v '^Status against revision' ;\ +# check if there is no modified files and all commits were pushed +check-up-to-date: + if [ `git status --short --branch | sed '/##[^[]*$/d;/^??/d' | wc -l` -gt 0 ]; then \ + (echo "ERROR: Source is not commited and pushed. See `git status`"; false) \ fi check-tagversion: - @if [ -d $(srcdir)/CVS ]; then \ - cd $(srcdir) && cvs status -v VERSION | grep -w `$(TAGVERSION) -n` ;\ - else \ - cd $(srcdir) && svn cat `$(TAGVERSION) --echourl`/VERSION; \ - fi >/dev/null; \ + cd $(srcdir) && $(TAGVERSION) --check >/dev/null; \ [ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false ) check-parse-old: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-inetd-2.21.4/Makefile.am.common new/yast2-inetd-2.21.5/Makefile.am.common --- old/yast2-inetd-2.21.4/Makefile.am.common 2013-01-16 15:47:00.000000000 +0100 +++ new/yast2-inetd-2.21.5/Makefile.am.common 2013-04-30 14:06:25.000000000 +0200 @@ -31,7 +31,7 @@ CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(client_DATA)"; then \ + @if test "$(filter %.ycp,client_DATA)"; then \ if $(CHECK_SYNTAX); then \ TO_CHECK="$(filter %.ycp,$^)"; \ echo "Checking syntax of $${TO_CHECK}"; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-inetd-2.21.4/Makefile.in new/yast2-inetd-2.21.5/Makefile.in --- old/yast2-inetd-2.21.4/Makefile.in 2013-01-16 15:47:03.000000000 +0100 +++ new/yast2-inetd-2.21.5/Makefile.in 2013-04-30 14:06:31.000000000 +0200 @@ -684,7 +684,7 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) + chmod -R a-w $(distdir); chmod u+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) @@ -980,19 +980,14 @@ package: check-up-to-date check-tagversion check-textdomain package-local -check-up-to-date check-cvs-up-to-date check-svn-up-to-date: - if [ -d $(srcdir)/CVS ]; then \ - cd $(srcdir) && ! cvs -q -n up 2>/dev/null | grep '^[MCAR] ';\ - else \ - cd $(srcdir) && ! LC_ALL=C svn status --show-updates --quiet | grep -v '^Status against revision' ;\ +# check if there is no modified files and all commits were pushed +check-up-to-date: + if [ `git status --short --branch | sed '/##[^[]*$/d;/^??/d' | wc -l` -gt 0 ]; then \ + (echo "ERROR: Source is not commited and pushed. See `git status`"; false) \ fi check-tagversion: - @if [ -d $(srcdir)/CVS ]; then \ - cd $(srcdir) && cvs status -v VERSION | grep -w `$(TAGVERSION) -n` ;\ - else \ - cd $(srcdir) && svn cat `$(TAGVERSION) --echourl`/VERSION; \ - fi >/dev/null; \ + cd $(srcdir) && $(TAGVERSION) --check >/dev/null; \ [ $$? = 0 ] || ( echo "ERROR: Please run 'tagversion' first"; false ) check-parse-old: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-inetd-2.21.4/VERSION new/yast2-inetd-2.21.5/VERSION --- old/yast2-inetd-2.21.4/VERSION 2013-01-16 15:44:18.000000000 +0100 +++ new/yast2-inetd-2.21.5/VERSION 2013-04-25 14:11:32.000000000 +0200 @@ -1 +1 @@ -2.21.4 +2.21.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-inetd-2.21.4/configure new/yast2-inetd-2.21.5/configure --- old/yast2-inetd-2.21.4/configure 2013-01-16 15:47:03.000000000 +0100 +++ new/yast2-inetd-2.21.5/configure 2013-04-30 14:06:30.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-inetd 2.21.4. +# Generated by GNU Autoconf 2.69 for yast2-inetd 2.21.5. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='yast2-inetd' PACKAGE_TARNAME='yast2-inetd' -PACKAGE_VERSION='2.21.4' -PACKAGE_STRING='yast2-inetd 2.21.4' +PACKAGE_VERSION='2.21.5' +PACKAGE_STRING='yast2-inetd 2.21.5' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1247,7 +1247,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-inetd 2.21.4 to adapt to many kinds of systems. +\`configure' configures yast2-inetd 2.21.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1318,7 +1318,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-inetd 2.21.4:";; + short | recursive ) echo "Configuration of yast2-inetd 2.21.5:";; esac cat <<\_ACEOF @@ -1398,7 +1398,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-inetd configure 2.21.4 +yast2-inetd configure 2.21.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1415,7 +1415,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-inetd $as_me 2.21.4, which was +It was created by yast2-inetd $as_me 2.21.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2354,7 +2354,7 @@ # Define the identity of the package. PACKAGE='yast2-inetd' - VERSION='2.21.4' + VERSION='2.21.5' cat >>confdefs.h <<_ACEOF @@ -2477,7 +2477,7 @@ -VERSION="2.21.4" +VERSION="2.21.5" RPMNAME="yast2-inetd" MAINTAINER="YaST2 Maintainers <[email protected]>" @@ -3403,7 +3403,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-inetd $as_me 2.21.4, which was +This file was extended by yast2-inetd $as_me 2.21.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3456,7 +3456,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-inetd config.status 2.21.4 +yast2-inetd config.status 2.21.5 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-inetd-2.21.4/configure.in new/yast2-inetd-2.21.5/configure.in --- old/yast2-inetd-2.21.4/configure.in 2013-01-16 15:47:00.000000000 +0100 +++ new/yast2-inetd-2.21.5/configure.in 2013-04-30 14:06:25.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-inetd dnl -dnl -- This file is generated by y2autoconf 2.23.2 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.24.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-inetd, 2.21.4, http://bugs.opensuse.org/, yast2-inetd) +AC_INIT(yast2-inetd, 2.21.5, http://bugs.opensuse.org/, yast2-inetd) 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.21.4" +VERSION="2.21.5" RPMNAME="yast2-inetd" MAINTAINER="YaST2 Maintainers <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-inetd-2.21.4/src/Makefile.in new/yast2-inetd-2.21.5/src/Makefile.in --- old/yast2-inetd-2.21.4/src/Makefile.in 2013-01-16 15:47:03.000000000 +0100 +++ new/yast2-inetd-2.21.5/src/Makefile.in 2013-04-30 14:06:31.000000000 +0200 @@ -829,7 +829,7 @@ dist-hook: check-syntax check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(client_DATA)"; then \ + @if test "$(filter %.ycp,client_DATA)"; then \ if $(CHECK_SYNTAX); then \ TO_CHECK="$(filter %.ycp,$^)"; \ echo "Checking syntax of $${TO_CHECK}"; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-inetd-2.21.4/testsuite/tests/Inetd.out new/yast2-inetd-2.21.5/testsuite/tests/Inetd.out --- old/yast2-inetd-2.21.4/testsuite/tests/Inetd.out 2013-01-15 17:00:15.000000000 +0100 +++ new/yast2-inetd-2.21.5/testsuite/tests/Inetd.out 2013-04-25 14:11:32.000000000 +0200 @@ -30,8 +30,8 @@ Dump Write .etc.xinetd_conf.services [$["comment":"My service", "enabled":true, "iid":"whatever", "protocol":"tcp", "server":"/usr/sbin/tcpd", "server_args":"in.fingerd -w", "service":"finger", "socket_type":"stream", "user":"nobody", "wait":false]] true Execute .target.bash_output "/bin/systemctl stop xinetd.service" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""] -Read .init.scripts.runlevel "xinetd" $["xinetd":$["start":[], "stop":[]]] -Read .init.scripts.comment "xinetd" $["xinetd":$[]] +Execute .target.bash "/bin/systemctl is-enabled xinetd.service" 0 +Execute .target.bash_output "/bin/systemctl disable xinetd.service" $["exit":0, "stderr":"", "stdout":""] Return true Dump Dump --- -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
