[prev in list] [next in list] [prev in thread] [next in thread]
List: opensuse-commit
Subject: commit susedoc-buildbook for openSUSE:Factory
From: root () hilbert ! suse ! de (h_root)
Date: 2010-10-28 14:43:31
Message-ID: 20101028144331.D4066201F5 () hilbert ! suse ! de
[Download RAW message or body]
Hello community,
here is the log from the commit of package susedoc-buildbook for openSUSE:Factory
checked in at Thu Oct 28 16:43:31 CEST 2010.
--------
--- susedoc-buildbook/susedoc-buildbook.changes 2010-09-21 10:34:44.000000000 +0200
+++ susedoc-buildbook/susedoc-buildbook.changes 2010-10-27 15:41:46.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Oct 27 15:40:49 CEST 2010 - ke@suse.de
+
+- 0.17:
+* doc_pre_checkin.sh: New.
+* buildbook.sh: New features: copypac and initpac; allow automatic
+ submitreq; allow check_pack on-the-fly.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
susedoc-buildbook-0.16.tar.bz2
New:
----
susedoc-buildbook-0.17.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ susedoc-buildbook.spec ++++++
--- /var/tmp/diff_new_pack.decJAd/_old 2010-10-28 16:43:02.000000000 +0200
+++ /var/tmp/diff_new_pack.decJAd/_new 2010-10-28 16:43:02.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package susedoc-buildbook (Version 0.16)
+# spec file for package susedoc-buildbook (Version 0.17)
#
# 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.16
+Version: 0.17
Release: 1
Source: %{name}-%{version}.tar.bz2
Url: https://svn.berlios.de/svnroot/repos/opensuse-doc/trunk/susedoc-buildbook
++++++ susedoc-buildbook-0.16.tar.bz2 -> susedoc-buildbook-0.17.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' old/susedoc-buildbook-0.16/Makefile.am \
new/susedoc-buildbook-0.17/Makefile.am
--- old/susedoc-buildbook-0.16/Makefile.am 2010-07-15 14:00:42.000000000 +0200
+++ new/susedoc-buildbook-0.17/Makefile.am 2010-10-27 15:37:47.000000000 +0200
@@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip foreign
SPEC_IN = book.spec.in
# SCRIPT_IN = buildbook-for-obs.sh.in
-EXTRA_DIST = $(SPEC_IN) $(bin_SCRIPTS)
+EXTRA_DIST = $(SPEC_IN) $(bin_SCRIPTS) doc_pre_checkin.sh
packdir = $(DESTDIR)$(datadir)/@PACKAGE@
@@ -13,6 +13,7 @@
pushd $(packdir) ; \
ln -s buildbook.sh buildbook-for-obs.sh ; \
popd
+ $(install_sh_DATA) doc_pre_checkin.sh $(packdir)
# buildbook-for-obs.sh: buildbook-for-obs.sh.in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' old/susedoc-buildbook-0.16/Makefile.in \
new/susedoc-buildbook-0.17/Makefile.in
--- old/susedoc-buildbook-0.16/Makefile.in 2010-09-21 10:09:10.000000000 +0200
+++ new/susedoc-buildbook-0.17/Makefile.in 2010-10-27 15:38:40.000000000 +0200
@@ -156,7 +156,7 @@
AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip foreign
SPEC_IN = book.spec.in
# SCRIPT_IN = buildbook-for-obs.sh.in
-EXTRA_DIST = $(SPEC_IN) $(bin_SCRIPTS)
+EXTRA_DIST = $(SPEC_IN) $(bin_SCRIPTS) doc_pre_checkin.sh
packdir = $(DESTDIR)$(datadir)/@PACKAGE@
# buildbook-for-obs.sh: buildbook-for-obs.sh.in
@@ -511,6 +511,7 @@
pushd $(packdir) ; \
ln -s buildbook.sh buildbook-for-obs.sh ; \
popd
+ $(install_sh_DATA) doc_pre_checkin.sh $(packdir)
# 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/susedoc-buildbook-0.16/NEWS \
new/susedoc-buildbook-0.17/NEWS
--- old/susedoc-buildbook-0.16/NEWS 2010-09-21 10:32:49.000000000 +0200
+++ new/susedoc-buildbook-0.17/NEWS 2010-10-27 15:31:32.000000000 +0200
@@ -1,3 +1,8 @@
+0.17:
+* doc_pre_checkin.sh: New.
+* buildbook.sh: New features: copypac and initpac; allow automatic
+ submitreq; allow check_pack on-the-fly.
+
0.16:
* update_spec.pl: Fix typo, actually use obsoletes entries.
* buildbook.sh: Fix the obsoleting opensuse-manuals_??-pdf statement.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' old/susedoc-buildbook-0.16/buildbook.sh \
new/susedoc-buildbook-0.17/buildbook.sh
--- old/susedoc-buildbook-0.16/buildbook.sh 2010-09-21 13:07:04.000000000 +0200
+++ new/susedoc-buildbook-0.17/buildbook.sh 2010-10-27 14:51:06.000000000 +0200
@@ -1,7 +1,7 @@
#!/bin/bash
-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: \
\ +TEMP=$(getopt -o acf:e:d:il:n:p:r:s:u:x \
+ --long automatic,check-pack,copy,copypac,copypack,debug,def:,extdir:,init,initpac,initpack,lang:,prep-local,name:,obsuser:,product:,pdf:,spec:,user: \
\
-n "$0" -- "$@")
# Note the quotes around `$TEMP': they are essential!
eval set -- "$TEMP"
@@ -28,14 +28,20 @@
# default
obsuser=keichwa
+my_echo=echo
while true ; do
case "$1" in
+ -a|--automatic) my_echo=""; shift 1;;
-c|--check-pack) check_pack=yes; shift 1;;
- -e|--extdir) packdir=$2 ; extdir=true ; check_dir $packdir; shift 2 ;;
+ --copy|--copypac|--copypack) make_type=copy; shift 1;;
-d|--def) product_file=$2 ; check_file $product_file; shift 2 ;;
+ -e|--extdir) packdir=$2 ; extdir=true ; check_dir $packdir; shift 2 ;;
+ -f) from_api_server=$2; shift 2 ;;
+ -i|--init|--initpac|--initpack) make_type=init; shift 1;;
-l|--lang) LL=$2 ; shift 2 ;;
-p|--pdf) pdf=$2 ; check_file $pdf; shift 2 ;;
--prep-local) prep_local=yes ; shift 1 ;;
+ -r) from_repo=$2; shift 2 ;;
-s|--spec) spec_in=$2; shift 2 ;;
-n|--name|--product) product=$2 ; shift 2 ;;
-u|--user|--obsuser) obsuser=$2 ; shift 2;;
@@ -55,6 +61,8 @@
Usage: $0 [options] -d DEF-file -n package_name
Valid options are:
+ -u user
+ specify the OBS username, default: '$obsuser'
-n package-name (without _LL)
Ususally 'PRODUCTNAME-guide', check the
Product devel projects for example names.
@@ -68,8 +76,12 @@
prepare local, do not submit to a build service instance
-s spec-file
use this spec-file as the template spec file
- -u user
- specify the OBS username, default: '$obsuser'
+ -a
+ automatic update (= send submitreq without human interaction)
+ --copy -f SOURCE-API-SERVER -r SOURCE-REPO
+ copy package (untested)
+ -i
+ initialize package
-x
enable debugging.
EOFusage
@@ -77,12 +89,27 @@
exit 1
}
-#echo $product_file $pdf $product
-#exit
+#echo=echo
+[ -z "$my_echo" ] && \
+ [ "$make_type" = copy -o "$make_type" = init ] && {
+ echo "automactic submission does not work with --copypac or --initpac"
+ exit 1
+}
+[ -z "$make_type" ] && make_type=update
+if [ "$make_type" = copy ]; then
+ [ -z "$from_api_server" ] && {
+ echo "from where to copy is missing: -f SOURCE-API-SERVER"; exit 1
+ }
+ [ -z "$from_repo" ] && {
+ echo "from which repo to copy is missing: -r SOURCE-REPO"; exit 1
+ }
+fi
if [ -z "$LL" ]; then
- # LL=$(make VARIABLE=LL showvariable)
- LL=$(basename $(pwd))
+ LL=$(make VARIABLE=LL showvariable)
+ [ -z "$LL"] && { echo "source ENV-* first"; exit 1; }
+ # this is not reliable enough...
+ # LL=$(basename $(pwd))
fi
# product=opensuse-manual
#product=$2
@@ -107,11 +134,15 @@
fi
# echo $spec_in; exit
spec=autobuild/${product}_${LL}.spec
-# comment if packages are to be built
-#echo=echo
-make_package () {
+make_validate () {
$echo make validate || exit 1
+ # now build the environment
+}
+
+make_package () {
+ # $echo make validate || exit 1
+ make_validate
$echo make package || exit 1
}
@@ -292,7 +323,8 @@
:
else
if [ -z "$extdir" ]; then
- $echo make validate || exit 1
+ # $echo make validate || exit 1
+ make_validate
$echo make package-pdf || exit 1
# $echo make pdf-color
# sources and graphics come with the HTML package
@@ -381,7 +413,8 @@
else
# build the real package
if [ -z "$extdir" ]; then
- $echo make validate || exit 1
+ # $echo make validate || exit 1
+ make_validate
$echo make package-html || exit 1
cp -p package-html-$1/${1}_$LL-{graphics,html,desktop}.tar.bz2 \
package-html-$1/${1}_$LL.tar.bz2 autobuild
@@ -479,6 +512,16 @@
done
### append "-pdf" after(!) the version number!!!
pdfobs="$pdfobs opensuse-manuals_$LL=11.3-pdf"
+ pdfobs="$pdfobs opensuse-apparmor-admin_$LL=11.3-pdf"
+ case $LL in
+ de) pdfobs="$pdfobs opensuse-apps_$LL=11.3-pdf"
+ pdfobs="$pdfobs opensuse-gnomeuser_$LL=11.3-pdf"
+ pdfobs="$pdfobs opensuse-kdeuser_$LL=11.3-pdf"
+ pdfobs="$pdfobs opensuse-security_$LL=11.3-pdf"
+ ;;
+ *) true
+ ;;
+ esac
set_obs_in_spec
elif [ $product = sled-manuals ]; then
# obsolete since sle11
@@ -546,42 +589,13 @@
if osc -A $check_server meta pkg $check_repo $package; then
echo $?
else
- echo does not exist in BS: $?
+ echo "$package does not exist in $check_repo: $?"
+ echo "copy it from somewhere else or initialize it manually"
+ exit 0
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
- {
- # osc -A $sr_server branch $sr_repo $package
- # check whether a devel project exists
- devel=$(osc -A $sr_server meta pkg $sr_repo $package \
- | xml sel -t -v //devel/@project)
- # check whether user is $devel maintainer
- [ -n "$devel" ] \
- && userp=$(osc -A $sr_server meta prj $devel \
- | xml sel -t -v //person/@userid=\'$obsuser\')
- repo=${devel:-$sr_repo}
- if [ -n "$userp" ]; then
- # $devel exists and user is maintainer, thus use $devel
- old $devel/$package
- osc -A $sr_server co $devel/$package
- wdir=$devel/$package
- else
- # first delete to avoid conflicts
- osc -A $sr_server rdelete home:$obsuser:branches:$repo $package
- osc -A $sr_server branch -m"branch from $sr_repo" $sr_repo $package
- wdir=home:$obsuser:branches:$repo/$package
- osc -A $sr_server co $wdir
- fi
- } || {
- echo $package not accessible by osc
- install -d $package
- }
+fix_spec_and_copy_autobuild () {
[ -n "$DISTVER" ] && PACK_VER=${DISTVER/ *SP/.}
sed -i "\
s:@version@:${PACK_VER:-$version}:
@@ -600,20 +614,133 @@
cd $wdir # home:$obsuser:branches:$repo/$package
sed -i s:update_spec.pl:/usr/bin/update_spec: doc_pre_checkin.sh
bash ./doc_pre_checkin.sh
- osc vc -m"Update text and image files."
- osc ci -m"Update $package"
+ default_msg="Update text and image files"
+ osc vc -m"$default_msg."
+ osc addremove
+ osc ci -m"$package: $default_msg"
+}
+
+tmp_project_values="<project name=\"home:$obsuser:tmp\">\
+ <title>tmp</title>\
+ <description> </description>\
+ <person role=\"maintainer\" userid=\"$obsuser\"/>\
+ <person role=\"bugowner\" userid=\"$obsuser\"/>\
+ <debuginfo> <disable/> </debuginfo>\
+ <build> <enable/> </build>\
+ <publish> <disable/> </publish>\
+</project>"
+
+tmp_package_values="<package name=\"$package\">\
+ <title>$package</title>\
+ <description> </description>\
+ <person role=\"maintainer\" userid=\"$obsuser\"/>\
+ <person role=\"bugowner\" userid=\"$obsuser\"/>\
+</package>"
+
+copypac () {
+ osc -A $sr_server rdelete home:$obsuser:tmp $package
+ osc -A $sr_server meta prj home:$obsuser:tmp \
+ || echo $tmp_project_values \
+ | osc -A https://api.suse.de meta prj home:$obsuser:tmp -F -
+ osc -A $from_api_server copypac \
+ -t $sr_server $from_repo $package home:$obsuser:tmp
+ wdir=home:$obsuser:tmp/$package
+ fix_spec_and_copy_autobuild
+
+ echo "osc -A $sr_server sr -m\"$default_msg\" home:$obsuser $package $sr_repo"
+}
+
+initpac () {
+ osc -A $sr_server rdelete home:$obsuser:tmp $package
+ osc -A $sr_server meta prj home:$obsuser:tmp \
+ || echo $tmp_project_values \
+ | osc -A https://api.suse.de meta prj home:$obsuser:tmp -F -
+ osc -A $sr_server meta pkg home:$obsuser:tmp $package \
+ || echo $tmp_package_values \
+ | 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
+ {
+ echo "group.$package Documentation/SUSE"
+ echo "license.$package GFDL 1.2"
+ echo "summary.$package guide (English)"
+ echo "+description.$package"
+ echo ""
+ echo "-description.$package"
+ echo "group.$package-pdf Documentation/SUSE"
+ echo "license.$package-pdf GFDL 1.2"
+ echo "summary.$package-pdf guide (English)"
+ echo "+description.$package-pdf"
+ echo ""
+ echo "-description.$package-pdf"
+ } > $wdir/attributes
+
+ fix_spec_and_copy_autobuild
+
+ echo "osc -A $sr_server sr -m \"$default_msg\" home:$obsuser:tmp $package \
$sr_repo" +}
+
+updatepac () {
+# finally prep package dir for the build system
+ [ -d $package ] && old $package
+ {
+ # osc -A $sr_server branch $sr_repo $package
+ # check whether a devel project exists
+ devel=$(osc -A $sr_server meta pkg $sr_repo $package \
+ | xml sel -t -v //devel/@project)
- if [ -n "$userp" ]; then
- echo "osc -A $sr_server sr $devel $package $sr_repo"
- else
if [ -n "$devel" ]; then
- echo "osc -A $sr_server sr home:$obsuser:branches:$repo $package $devel"
+ repo=$devel
else
- echo "osc -A $sr_server sr home:$obsuser:branches:$repo $package $sr_repo"
+ repo=$sr_repo
fi
+
+ userp=$(osc -A $sr_server meta prj $repo \
+ | xml sel -t -v //person[@role=\'maintainer\']/@userid=\'$obsuser\')
+ if "$userp" ; then
+ # $devel exists and user is maintainer, thus use $devel
+ old $repo/$package
+ osc -A $sr_server co $repo/$package
+ wdir=$repo/$package
+ else
+ # first delete to avoid conflicts
+ osc -A $sr_server rdelete home:$obsuser:branches:$repo $package
+ osc -A $sr_server branch -m"branch from $repo" $repo $package
+ wdir=home:$obsuser:branches:$repo/$package
+ osc -A $sr_server co $wdir
+ fi
+ } || {
+ echo $package not accessible by osc
+ install -d $package
+ }
+
+ fix_spec_and_copy_autobuild
+
+ if [ -n "$devel" -a "$userp" = true ]; then
+ # submitreq to product
+ $my_echo "osc -A $sr_server sr -m\"$default_msg\" $repo $package $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
+ $my_echo "osc -A $sr_server sr -m\"$default_msg\" home:$obsuser:branches:$repo \
$package $repo" + else
+ # $userp, but no $devel -- everything is fine
+ :
fi
}
+prep_xbs () {
+ sr_server=${1:-https\://api.opensuse.org}
+ sr_repo=${2:-openSUSE\:Factory}
+ case $3 in
+ update) updatepac ;;
+ copy) copypac ;;
+ init) initpac ;;
+ *) echo "unsupported make_type"; exit 1 ;;
+ esac
+}
+
###
### main
###
@@ -643,6 +770,6 @@
echo $((no++)) >/dev/null
done < <(grep -v ^# $product_file)
-[ -n "$prep_local" ] || prep_xbs $xbs_server $xbs_prj
+[ -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.16/configure \
new/susedoc-buildbook-0.17/configure
--- old/susedoc-buildbook-0.16/configure 2010-09-21 10:09:11.000000000 +0200
+++ new/susedoc-buildbook-0.17/configure 2010-10-27 15:32:29.000000000 +0200
@@ -2121,7 +2121,7 @@
# Define the identity of the package.
PACKAGE=susedoc-buildbook
- VERSION=0.16
+ VERSION=0.17
cat >>confdefs.h <<_ACEOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' old/susedoc-buildbook-0.16/configure.ac \
new/susedoc-buildbook-0.17/configure.ac
--- old/susedoc-buildbook-0.16/configure.ac 2010-09-21 10:04:44.000000000 +0200
+++ new/susedoc-buildbook-0.17/configure.ac 2010-10-27 15:31:53.000000000 +0200
@@ -1,4 +1,4 @@
AC_INIT([book.spec.in])
-AM_INIT_AUTOMAKE([susedoc-buildbook], [0.16])
+AM_INIT_AUTOMAKE([susedoc-buildbook], [0.17])
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' \
'--exclude=.svnignore' old/susedoc-buildbook-0.16/doc_pre_checkin.sh \
new/susedoc-buildbook-0.17/doc_pre_checkin.sh
--- old/susedoc-buildbook-0.16/doc_pre_checkin.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/susedoc-buildbook-0.17/doc_pre_checkin.sh 2010-09-24 10:55:16.000000000 +0200
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+filename=$(echo *.spec)
+perl /usr/bin/update_spec $filename attributes > $filename.new
+ mv $filename.new $filename
+
+exit 0
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic