Hello community, here is the log from the commit of package susedoc-buildbook for openSUSE:Factory checked in at Wed Nov 10 20:08:22 CET 2010. -------- --- susedoc-buildbook/susedoc-buildbook.changes 2010-10-27 15:41:46.000000000 +0200 +++ susedoc-buildbook/susedoc-buildbook.changes 2010-11-09 16:51:06.000000000 +0100 @@ -1,0 +2,13 @@ +Tue Nov 9 16:49:36 CET 2010 - ke@suse.de + +- 0.19: +* fix one of the submitreq commands. + +------------------------------------------------------------------- +Fri Oct 29 13:25:45 CEST 2010 - ke@suse.de + +- 0.18: +* fix typo. +* initpac: copy doc_pre_checkin.sh from the file system. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- susedoc-buildbook-0.17.tar.bz2 New: ---- susedoc-buildbook-0.19.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ susedoc-buildbook.spec ++++++ --- /var/tmp/diff_new_pack.EAWpNE/_old 2010-11-10 20:07:50.000000000 +0100 +++ /var/tmp/diff_new_pack.EAWpNE/_new 2010-11-10 20:07:50.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package susedoc-buildbook (Version 0.17) +# spec file for package susedoc-buildbook (Version 0.19) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ Group: Documentation/SUSE AutoReqProv: on Summary: susedoc Book Build Script -Version: 0.17 +Version: 0.19 Release: 1 Source: %{name}-%{version}.tar.bz2 Url: https://svn.berlios.de/svnroot/repos/opensuse-doc/trunk/susedoc-buildbook ++++++ susedoc-buildbook-0.17.tar.bz2 -> susedoc-buildbook-0.19.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc-buildbook-0.17/NEWS new/susedoc-buildbook-0.19/NEWS --- old/susedoc-buildbook-0.17/NEWS 2010-10-27 15:31:32.000000000 +0200 +++ new/susedoc-buildbook-0.19/NEWS 2010-11-09 16:36:43.000000000 +0100 @@ -1,3 +1,10 @@ +0.19: +* fix one of the submitreq commands. + +0.18: +* fix typo. +* initpac: copy doc_pre_checkin.sh from the file system. + 0.17: * doc_pre_checkin.sh: New. * buildbook.sh: New features: copypac and initpac; allow automatic diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc-buildbook-0.17/book.spec.in new/susedoc-buildbook-0.19/book.spec.in --- old/susedoc-buildbook-0.17/book.spec.in 2010-10-19 17:12:17.000000000 +0200 +++ new/susedoc-buildbook-0.19/book.spec.in 2010-11-03 14:03:57.000000000 +0100 @@ -146,8 +146,8 @@ s|^Categories=.*|Categories=System;Core;Translation;Documentation| s|^\(Name.*\)|\1 (PDF)|" $f done + popd fi -popd if [ %{my_lang} = "en" ]; then mkdir -p $RPM_BUILD_ROOT%{_datadir}/help for f in yelp/*.document; do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc-buildbook-0.17/buildbook.sh new/susedoc-buildbook-0.19/buildbook.sh --- old/susedoc-buildbook-0.17/buildbook.sh 2010-10-27 14:51:06.000000000 +0200 +++ new/susedoc-buildbook-0.19/buildbook.sh 2010-11-09 08:51:09.000000000 +0100 @@ -106,8 +106,10 @@ fi if [ -z "$LL" ]; then + # find first first ENV and source it + . ENV-$(grep -v ^# $product_file | awk '{print $2;exit}') LL=$(make VARIABLE=LL showvariable) - [ -z "$LL"] && { echo "source ENV-* first"; exit 1; } + [ -z "$LL" ] && { echo "source ENV-* first"; exit 1; } # this is not reliable enough... # LL=$(basename $(pwd)) fi @@ -660,7 +662,8 @@ | osc -A https://api.suse.de meta pkg home:$obsuser:tmp $package -F - wdir=home:$obsuser:tmp/$package osc -A $sr_server co $wdir - echo true > $wdir/doc_pre_checkin.sh + cp /usr/share/susedoc-buildbook/doc_pre_checkin.sh \ + $wdir/doc_pre_checkin.sh { echo "group.$package Documentation/SUSE" echo "license.$package GFDL 1.2" @@ -719,7 +722,7 @@ if [ -n "$devel" -a "$userp" = true ]; then # submitreq to product - $my_echo "osc -A $sr_server sr -m\"$default_msg\" $repo $package $repo" + $my_echo "osc -A $sr_server sr -m\"$default_msg\" $repo $package $sr_repo" elif [ -n "$devel" -a "$userp" = false ]; then $my_echo "osc -A $sr_server sr -m\"$default_msg\" home:$obsuser:branches:$repo $package $devel" elif [ -z "$devel" -a "$userp" = false ]; then @@ -731,8 +734,8 @@ } prep_xbs () { - sr_server=${1:-https\://api.opensuse.org} - sr_repo=${2:-openSUSE\:Factory} + sr_server=$1 + sr_repo=$2 case $3 in update) updatepac ;; copy) copypac ;; @@ -770,6 +773,8 @@ echo $((no++)) >/dev/null done < <(grep -v ^# $product_file) +xbs_server=${xbs_server:-https\://api.opensuse.org} +xbs_prj=${xbs_prj:-openSUSE\:Factory} [ -n "$prep_local" ] || prep_xbs $xbs_server $xbs_prj $make_type exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc-buildbook-0.17/configure new/susedoc-buildbook-0.19/configure --- old/susedoc-buildbook-0.17/configure 2010-10-27 15:32:29.000000000 +0200 +++ new/susedoc-buildbook-0.19/configure 2010-11-09 16:47:39.000000000 +0100 @@ -2121,7 +2121,7 @@ # Define the identity of the package. PACKAGE=susedoc-buildbook - VERSION=0.17 + VERSION=0.19 cat >>confdefs.h <<_ACEOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc-buildbook-0.17/configure.ac new/susedoc-buildbook-0.19/configure.ac --- old/susedoc-buildbook-0.17/configure.ac 2010-10-27 15:31:53.000000000 +0200 +++ new/susedoc-buildbook-0.19/configure.ac 2010-11-09 16:38:02.000000000 +0100 @@ -1,4 +1,4 @@ AC_INIT([book.spec.in]) -AM_INIT_AUTOMAKE([susedoc-buildbook], [0.17]) +AM_INIT_AUTOMAKE([susedoc-buildbook], [0.19]) AC_CONFIG_FILES([Makefile]) AC_OUTPUT ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org