Hello community, here is the log from the commit of package susedoc-buildbook for openSUSE:Factory checked in at Tue Jul 20 20:29:42 CEST 2010. -------- --- susedoc-buildbook/susedoc-buildbook.changes 2010-07-15 14:18:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/susedoc-buildbook/susedoc-buildbook.changes 2010-07-20 10:37:44.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Jul 20 10:36:34 CEST 2010 - ke@suse.de + +- 0.10: +* Use update_spec in the buildbook script. + + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- susedoc-buildbook-0.9.tar.bz2 New: ---- list_public susedoc-buildbook-0.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ susedoc-buildbook.spec ++++++ --- /var/tmp/diff_new_pack.kOki1u/_old 2010-07-20 20:21:29.000000000 +0200 +++ /var/tmp/diff_new_pack.kOki1u/_new 2010-07-20 20:21:29.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package susedoc-buildbook (Version 0.9) +# spec file for package susedoc-buildbook (Version 0.10) # # 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.9 +Version: 0.10 Release: 1 Source: %{name}-%{version}.tar.bz2 Url: https://svn.berlios.de/svnroot/repos/opensuse-doc/trunk/susedoc-buildbook ++++++ list_public ++++++ ++++ 1145 lines (skipped) ++++++ susedoc-buildbook-0.9.tar.bz2 -> susedoc-buildbook-0.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc-buildbook-0.9/NEWS new/susedoc-buildbook-0.10/NEWS --- old/susedoc-buildbook-0.9/NEWS 2010-07-15 14:02:17.000000000 +0200 +++ new/susedoc-buildbook-0.10/NEWS 2010-07-20 10:30:58.000000000 +0200 @@ -1,5 +1,7 @@ +0.10: * New file: update_spec.pl for updating .spec files before package building (thanks to Stephan Kulow and Jürgen Weigert). +* Use update_spec in the buildbook script. 0.8: * Better support of BS devel project setup. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc-buildbook-0.9/book.spec.in new/susedoc-buildbook-0.10/book.spec.in --- old/susedoc-buildbook-0.9/book.spec.in 2010-06-30 17:07:17.000000000 +0200 +++ new/susedoc-buildbook-0.10/book.spec.in 2010-07-19 14:19:29.000000000 +0200 @@ -9,7 +9,6 @@ #OBS #SOURCES Source901: pre_checkin.sh -Source902: update_spec.pl Source903: attributes BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc-buildbook-0.9/buildbook.sh new/susedoc-buildbook-0.10/buildbook.sh --- old/susedoc-buildbook-0.9/buildbook.sh 2010-07-02 12:48:17.000000000 +0200 +++ new/susedoc-buildbook-0.10/buildbook.sh 2010-07-19 14:20:10.000000000 +0200 @@ -1,7 +1,7 @@ #!/bin/bash -TEMP=$(getopt -o e:d:l:n:p:s:u:x \ - --long debug,def:,extdir:,lang:,prep-local,name:,obsuser:,product:,pdf:,spec:,user: \ +TEMP=$(getopt -o ce:d:l:n:p:s:u:x \ + --long check-pack,debug,def:,extdir:,lang:,prep-local,name:,obsuser:,product:,pdf:,spec:,user: \ -n "$0" -- "$@") # Note the quotes around `$TEMP': they are essential! eval set -- "$TEMP" @@ -22,6 +22,7 @@ obsuser=keichwa while true ; do case "$1" in + -c|--check-pack) check_pack=yes; shift 1;; -e|--extdir) packdir=$2 ; extdir=true ; check_dir $packdir; shift 2 ;; -d|--def) product_file=$2 ; check_file $product_file; shift 2 ;; -l|--lang) LL=$2 ; shift 2 ;; @@ -530,17 +531,22 @@ edit_spec_obsoletes_provides +check_pack_xbs () { + check_server=${1:-https\://api.opensuse.org} + check_repo=${2:-openSUSE\:Factory} + if osc -A $check_server meta pkg $check_repo $package; then + echo $? + else + echo does not exist in BS: $? + fi + exit 0 +} + prep_xbs () { sr_server=${1:-https\://api.opensuse.org} sr_repo=${2:-openSUSE\:Factory} # finally prep package dir for the build system [ -d $package ] && old $package -# sle10-sp-i386 sle10-sp-s390x sle10-sp-ppc sles10-i386 sles10-s390x sles10-ppc" -# adjust for OBS - case $package in - sle*) dist="sle11 noarch i586" ;; - *) dist="noarch head-i586" ;; - esac { # osc -A $sr_server branch $sr_repo $package # check whether a devel project exists @@ -551,7 +557,7 @@ && userp=$(osc -A $sr_server meta prj $devel \ | xml sel -t -v //person/@userid=\'$obsuser\') repo=${devel:-$sr_repo} - if $userp; then + if "$userp"; then # $devel exists and user is maintainer, thus use $devel old $devel/$package osc -A $sr_server co $devel/$package @@ -567,12 +573,6 @@ echo $package not accessible by osc install -d $package } -### # the quickbooks need special treatment -### # is this still valid? -### if [ -f $package/dot.directory ]; then -### sed -i "/^#SOURCES/i\\ -### Source100: dot.directory" $spec -### fi [ -n "$DISTVER" ] && PACK_VER=${DISTVER/ *SP/.} sed -i "\ s:@version@:${PACK_VER:-$version}: @@ -589,11 +589,12 @@ cp -vp autobuild/* $wdir ### cd $wdir # home:$obsuser:branches:$repo/$package + sed -i s:update_spec.pl:/usr/bin/update-spec: pre_checkin.sh bash ./pre_checkin.sh osc vc -m"Update text and image files." osc ci -m"Update $package" - if [ -n "userp" ]; then + if [ -n "$userp" ]; then echo "osc -A $sr_server sr $devel $package $sr_repo" else if [ -n "$devel" ]; then @@ -614,6 +615,9 @@ # Make sure to preserve a value once set [ -n "$server" ] && xbs_server=$server [ -n "$prj" ] && xbs_prj=$prj + if [ $check_pack = yes ]; then + check_pack_xbs $xbs_server $xbs_prj + fi echo $format $book | tee -a pack.log case $format in pdfhtml) make_pdfhtml $book $no $copyright $status diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc-buildbook-0.9/configure new/susedoc-buildbook-0.10/configure --- old/susedoc-buildbook-0.9/configure 2010-07-15 14:04:57.000000000 +0200 +++ new/susedoc-buildbook-0.10/configure 2010-07-20 10:35:10.000000000 +0200 @@ -2205,7 +2205,7 @@ # Define the identity of the package. PACKAGE=susedoc-buildbook - VERSION=0.9 + VERSION=0.10 cat >>confdefs.h <<_ACEOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc-buildbook-0.9/configure.ac new/susedoc-buildbook-0.10/configure.ac --- old/susedoc-buildbook-0.9/configure.ac 2010-07-15 14:04:20.000000000 +0200 +++ new/susedoc-buildbook-0.10/configure.ac 2010-07-20 10:30:48.000000000 +0200 @@ -1,4 +1,4 @@ AC_INIT([book.spec.in]) -AM_INIT_AUTOMAKE([susedoc-buildbook], [0.9]) +AM_INIT_AUTOMAKE([susedoc-buildbook], [0.10]) 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