Hello community, here is the log from the commit of package yast2-devtools for openSUSE:Factory checked in at 2013-04-17 23:19:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-devtools (Old) and /work/SRC/openSUSE:Factory/.yast2-devtools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-devtools", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-devtools/yast2-devtools.changes 2013-01-31 10:29:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-devtools.new/yast2-devtools.changes 2013-04-17 23:19:05.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Apr 8 10:41:43 UTC 2013 - [email protected] + +- fix tagversion to work with git +- fix package checks to work with git +- allow resubmit package to BS without changes entry +- 2.24.0 + +------------------------------------------------------------------- Old: ---- yast2-devtools-2.23.2.tar.bz2 New: ---- yast2-devtools-2.24.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-devtools.spec ++++++ --- /var/tmp/diff_new_pack.U3iH04/_old 2013-04-17 23:19:06.000000000 +0200 +++ /var/tmp/diff_new_pack.U3iH04/_new 2013-04-17 23:19:06.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-devtools -Version: 2.23.2 +Version: 2.24.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-devtools-2.23.2.tar.bz2 -> yast2-devtools-2.24.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-2.23.2/Makefile.am new/yast2-devtools-2.24.0/Makefile.am --- old/yast2-devtools-2.23.2/Makefile.am 2013-01-24 18:38:24.000000000 +0100 +++ new/yast2-devtools-2.24.0/Makefile.am 2013-04-10 18:39:49.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-devtools-2.23.2/Makefile.am.common new/yast2-devtools-2.24.0/Makefile.am.common --- old/yast2-devtools-2.23.2/Makefile.am.common 2013-01-24 18:38:24.000000000 +0100 +++ new/yast2-devtools-2.24.0/Makefile.am.common 2013-04-10 18:39:49.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-devtools-2.23.2/Makefile.in new/yast2-devtools-2.24.0/Makefile.in --- old/yast2-devtools-2.23.2/Makefile.in 2013-01-24 18:38:35.000000000 +0100 +++ new/yast2-devtools-2.24.0/Makefile.in 2013-04-10 18:40:01.000000000 +0200 @@ -1050,19 +1050,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-devtools-2.23.2/VERSION new/yast2-devtools-2.24.0/VERSION --- old/yast2-devtools-2.23.2/VERSION 2013-01-21 16:11:19.000000000 +0100 +++ new/yast2-devtools-2.24.0/VERSION 2013-04-08 12:46:30.000000000 +0200 @@ -1 +1 @@ -2.23.2 +2.24.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-2.23.2/configure new/yast2-devtools-2.24.0/configure --- old/yast2-devtools-2.23.2/configure 2013-01-24 18:38:34.000000000 +0100 +++ new/yast2-devtools-2.24.0/configure 2013-04-10 18:40:00.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-devtools 2.23.2. +# Generated by GNU Autoconf 2.69 for yast2-devtools 2.24.0. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='yast2-devtools' PACKAGE_TARNAME='yast2-devtools' -PACKAGE_VERSION='2.23.2' -PACKAGE_STRING='yast2-devtools 2.23.2' +PACKAGE_VERSION='2.24.0' +PACKAGE_STRING='yast2-devtools 2.24.0' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1383,7 +1383,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-devtools 2.23.2 to adapt to many kinds of systems. +\`configure' configures yast2-devtools 2.24.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1454,7 +1454,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-devtools 2.23.2:";; + short | recursive ) echo "Configuration of yast2-devtools 2.24.0:";; esac cat <<\_ACEOF @@ -1571,7 +1571,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-devtools configure 2.23.2 +yast2-devtools configure 2.24.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1970,7 +1970,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-devtools $as_me 2.23.2, which was +It was created by yast2-devtools $as_me 2.24.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2909,7 +2909,7 @@ # Define the identity of the package. PACKAGE='yast2-devtools' - VERSION='2.23.2' + VERSION='2.24.0' cat >>confdefs.h <<_ACEOF @@ -3032,7 +3032,7 @@ -VERSION="2.23.2" +VERSION="2.24.0" RPMNAME="yast2-devtools" MAINTAINER="Martin Vidner <[email protected]>" @@ -16315,7 +16315,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-devtools $as_me 2.23.2, which was +This file was extended by yast2-devtools $as_me 2.24.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16372,7 +16372,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-devtools config.status 2.23.2 +yast2-devtools config.status 2.24.0 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-devtools-2.23.2/configure.in new/yast2-devtools-2.24.0/configure.in --- old/yast2-devtools-2.23.2/configure.in 2013-01-24 18:38:24.000000000 +0100 +++ new/yast2-devtools-2.24.0/configure.in 2013-04-10 18:39:49.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-devtools 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-devtools, 2.23.2, http://bugs.opensuse.org/, yast2-devtools) +AC_INIT(yast2-devtools, 2.24.0, http://bugs.opensuse.org/, yast2-devtools) 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.23.2" +VERSION="2.24.0" RPMNAME="yast2-devtools" MAINTAINER="Martin Vidner <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-2.23.2/devtools/admin/Makefile.am.common new/yast2-devtools-2.24.0/devtools/admin/Makefile.am.common --- old/yast2-devtools-2.23.2/devtools/admin/Makefile.am.common 2013-01-21 16:11:19.000000000 +0100 +++ new/yast2-devtools-2.24.0/devtools/admin/Makefile.am.common 2013-04-10 18:39:42.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-devtools-2.23.2/devtools/admin/Makefile.am.toplevel new/yast2-devtools-2.24.0/devtools/admin/Makefile.am.toplevel --- old/yast2-devtools-2.23.2/devtools/admin/Makefile.am.toplevel 2013-01-21 16:11:19.000000000 +0100 +++ new/yast2-devtools-2.24.0/devtools/admin/Makefile.am.toplevel 2013-04-08 12:46:30.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-devtools-2.23.2/devtools/bin/oscsubmit new/yast2-devtools-2.24.0/devtools/bin/oscsubmit --- old/yast2-devtools-2.23.2/devtools/bin/oscsubmit 2013-01-21 16:11:19.000000000 +0100 +++ new/yast2-devtools-2.24.0/devtools/bin/oscsubmit 2013-04-10 18:39:42.000000000 +0200 @@ -20,11 +20,12 @@ echo "Usage: $0 [OPTIONS]" echo echo "OPTIONS:" - echo " -h, --help this message" - echo " -d, --devel-project development project to submit to; default YaST:Head" - echo " -p, --project project to create submit request to" - echo " -l, --log the logfile, default ~/.y2submitlog" - echo " -e, --empty-log empty the log before starting" + echo " -h, --help this message" + echo " -d, --devel-project development project to submit to; default YaST:Head" + echo " -p, --project project to create submit request to" + echo " -l, --log the logfile, default ~/.y2submitlog" + echo " -e, --empty-log empty the log before starting" + echo " -i, --ignore-unchanged-changelog changes submit even if changes doesn't change" echo } @@ -32,9 +33,10 @@ OBS_PROJECT=YaST:Head OBS_MOVE_PROJECT="" LOGFILE=~/.y2submitlog +IGNORE_CHANGES=0 # parse parameters -TEMP=`/usr/bin/getopt -o hl:d:p:e --long help,log:,devel-project:,project:,empty-log \ +TEMP=`/usr/bin/getopt -o hil:d:p:e --long help,ignore-unchanged-changelog,log:,devel-project:,project:,empty-log \ -n 'oscsubmit' -- "$@"` # Note the quotes around `$TEMP': they are essential! @@ -47,6 +49,7 @@ -d|--devel-project) OBS_PROJECT="$2"; shift 2; ;; -p|--project) OBS_MOVE_PROJECT="$2"; shift 2; ;; -e|--empty-log) EMPTY_LOG=1; shift; ;; + -i|--ignore-unchanged-changelog) IGNORE_CHANGES=1; shift; ;; --) shift ; break ;; *) echo "Unrecognized option $1" ; exit 1 ;; @@ -100,11 +103,15 @@ exit 4 fi -if grep '^<' diff ; then +if grep '^<' diff; then echo -n ""; else + if [ $IGNORE_CHANGES -eq 1 ]; then + echo "resubmit" > diff + else echo "There are no new changes in SVN." | tee -a $LOGFILE exit 4 + fi fi echo -n "Submitting the package... " | tee -a $LOGFILE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-2.23.2/devtools/bin/tagversion new/yast2-devtools-2.24.0/devtools/bin/tagversion --- old/yast2-devtools-2.23.2/devtools/bin/tagversion 2013-01-21 16:11:19.000000000 +0100 +++ new/yast2-devtools-2.24.0/devtools/bin/tagversion 2013-04-08 12:46:30.000000000 +0200 @@ -1,15 +1,16 @@ #!/bin/bash # $Id$ usage () { - echo "tagversion, tag version in subversion" + echo "tagversion, tag version in git and push it" + echo "Tag format is stable-<VERSION> for master or <branch>-<VERSION>," + echo "e.g. stable-2.26.3 or Code-11-SP3-2.25.15" + echo "" echo "options:" - echo " -h, --help: this help" - echo " -n, --echo: don't tag, just echo tag name" - echo " -u, --echourl: don't tag, just echo tag url (Subversion only)" - echo " -r, --remove: remove the tag (after adding it by mistake, SVN only)" + echo " -h, --help: this help" + echo " -c, --check: check if package is already tagged (quick local check)" } -OPTIONS=`getopt --name $0 --options hnru --longoptions help,echo,echourl,remove -- "$@"` || { usage; exit 1; } +OPTIONS=`getopt --name $0 --options hc --longoptions help,check -- "$@"` || { usage; exit 1; } eval set -- "$OPTIONS" while true; do case "$1" in @@ -21,14 +22,8 @@ usage exit ;; - -n|--echo) - ECHO=1 - ;; - -r|--remove) - REMOVE=1 - ;; - -u|--echourl) - ECHOURL=1 + -c|--check) + CHECK=1 ;; esac shift @@ -41,72 +36,25 @@ exit 1 fi -if [ -d CVS ]; then - - b=`cvs status VERSION | grep 'SuSE-.*-Branch' | sed 's/^.*SuSE-\(.*\)-Branch.*$/\1/'` - if [ "$b" ]; then - t=branch-$b-$v - else - t=stable-$v - fi - if [ "$ECHO" ]; then - echo "$t" - elif [ "$ECHOURL" ]; then - echo "echo tag url not supported in CVS" - elif [ "$REMOVE" ]; then - echo "echo tag removing not supported in CVS" - else - echo "$p $t" - cvs tag $t - fi - +BRANCH=`git branch | sed '/^[^\*]/d;s/^\*[[:space:]]*//;'` +if [ "$BRANCH" = "master" ]; then + t=stable-$v else + t=$BRANCH-$v +fi - # sed -n -e 's///;T;p;q' - # means: print just the line on which the subst succeeded - - # URLs don't contain spaces so it's safe to use them as delimiters - svn info | sed -n -e 's@^URL: \(.*\)/\(trunk\|branches/.*\)/\([^/]*\)$@\1 \2 \3@;T;p;q' | { - # the pipe creates a subshell. the variables will be lost when it's left - # therefore the {braces} - read REPOSITORY BRANCH MODULE - : $REPOSITORY $BRANCH $MODULE - b=${BRANCH##branches*/} - b=${b#SuSE-} - b=${b%-Branch} - if [ "$b" = "trunk" ]; then - t=stable-$v - else - t=branch-$b-$v - fi - - URL_t=$REPOSITORY/tags/$t - if [ "$ECHO" ]; then - echo "$t" - elif [ "$ECHOURL" ]; then - echo "$URL_t/$MODULE" - elif [ "$REMOVE" ]; then - svn rm --message "Removed tag $t for $MODULE" "$URL_t/$MODULE" - else - echo "$p $t" - svn mkdir --message "Created tag $t" $REPOSITORY/tags/$t - - # create parent directories - # (they may exist already) - case $MODULE in - */*) MODULEPARENT=${MODULE%/*} ;; - *) MODULEPARENT="" ;; - esac - MDIR="" - # this will iterate thru directory components of MODULEPARENT - OIFS="$IFS"; IFS="/" - for DIR in $MODULEPARENT; do - MDIR="$MDIR$DIR/" - svn mkdir --message "Created tag $t for $MDIR" "$REPOSITORY/tags/$t/$MDIR" - done - IFS="$OIFS" - - svn copy --message "Created tag $t for $MODULE" "$REPOSITORY/$BRANCH/$MODULE" "$URL_t" - fi - } +if [ $CHECK -eq 1 ]; then + # simple check local tags if developer do not forget to create tag + COUNT=`git tag | grep -c $t` + if [ $COUNT -ge 1 ]; then + echo "Tag is there." + exit 0 + else + echo "Tag '$t' missing." + exit 1 + fi +else + git tag $t + git push --tags fi + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-2.23.2/devtools/bin/version new/yast2-devtools-2.24.0/devtools/bin/version --- old/yast2-devtools-2.23.2/devtools/bin/version 2013-01-24 18:38:45.000000000 +0100 +++ new/yast2-devtools-2.24.0/devtools/bin/version 2013-04-10 18:40:11.000000000 +0200 @@ -1,5 +1,5 @@ #!/bin/bash -echo 2.23.2 +echo 2.24.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-2.23.2/yast2/ycp.vim new/yast2-devtools-2.24.0/yast2/ycp.vim --- old/yast2-devtools-2.23.2/yast2/ycp.vim 2013-01-21 16:11:19.000000000 +0100 +++ new/yast2-devtools-2.24.0/yast2/ycp.vim 2013-04-10 17:41:31.000000000 +0200 @@ -385,6 +385,10 @@ syn keyword ycpWidgetSpecial bottomMargin syn keyword ycpWidgetSpecial BackgroundPixmap +" folding region definition +syn region ycpFold start="{" end="}" transparent fold +syn sync fromstart + " comment miniles if !exists("c_minlines") let c_minlines = 15 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
