commit susedoc-buildbook for openSUSE:Factory
Hello community, here is the log from the commit of package susedoc-buildbook for openSUSE:Factory checked in at Wed May 5 23:07:42 CEST 2010. -------- --- susedoc-buildbook/susedoc-buildbook.changes 2010-04-22 08:59:32.000000000 +0200 +++ susedoc-buildbook/susedoc-buildbook.changes 2010-05-05 09:39:38.000000000 +0200 @@ -1,0 +2,9 @@ +Wed May 5 09:37:53 CEST 2010 - ke@suse.de + +- 0.5: +* Prepare local build without submitting to the OBS/IBS (--prep-local). +* Remove spurious "as" in .document; drop + susedoc-build-dot-document.patch. +* Add obsoletes for slepos-guide; bnc#602450. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- susedoc-build-dot-document.patch susedoc-buildbook-0.4.tar.bz2 New: ---- susedoc-buildbook-0.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ susedoc-buildbook.spec ++++++ --- /var/tmp/diff_new_pack.aMDIRO/_old 2010-05-05 23:06:57.000000000 +0200 +++ /var/tmp/diff_new_pack.aMDIRO/_new 2010-05-05 23:06:57.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package susedoc-buildbook (Version 0.4) +# spec file for package susedoc-buildbook (Version 0.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,10 +23,9 @@ Group: Documentation/SuSE AutoReqProv: on Summary: susedoc Book Build Script -Version: 0.4 -Release: 2 +Version: 0.5 +Release: 1 Source: %{name}-%{version}.tar.bz2 -Patch: susedoc-build-dot-document.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -41,7 +40,6 @@ %prep %setup -q -%patch -p 0 ./configure --prefix=%{_prefix} %build ++++++ susedoc-buildbook-0.4.tar.bz2 -> susedoc-buildbook-0.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc-buildbook-0.4/NEWS new/susedoc-buildbook-0.5/NEWS --- old/susedoc-buildbook-0.4/NEWS 2010-04-01 14:08:28.000000000 +0200 +++ new/susedoc-buildbook-0.5/NEWS 2010-05-05 09:32:43.000000000 +0200 @@ -1,3 +1,8 @@ +0.5: +* Prepare local build without submitting to the OBS/IBS (--prep-local). +* Remove spurious "as" in .document. +* Add obsoletes for slepos-guide. + 0.4: * Provide default .changes entry. * Remove obsolete buildbook.sh script. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc-buildbook-0.4/book.spec.in new/susedoc-buildbook-0.5/book.spec.in --- old/susedoc-buildbook-0.4/book.spec.in 2010-04-01 13:36:00.000000000 +0200 +++ new/susedoc-buildbook-0.5/book.spec.in 2010-04-22 08:52:44.000000000 +0200 @@ -144,7 +144,8 @@ s/^X-DOC-Identifier=/DocIdentifier=com.novell./ s/^X-DOC-Weight/DocWeight/ " $f > ../%{name}.document - my_title=$(echo "%{summary}" | sed 's/[Pp][Dd][Ff]//;s/(.*)//') + my_title=$(echo "%{summary}" \ + | sed 's/\(as \)*[Pp][Dd][Ff]//;s/ *(.*)//') #if grep -s -q '^Name *= *$' ../%{name}.document; then sed -i " s/^\(Name.*\)=\(.*\)/\1=$my_title \2/" ../%{name}.document diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc-buildbook-0.4/buildbook.sh new/susedoc-buildbook-0.5/buildbook.sh --- old/susedoc-buildbook-0.4/buildbook.sh 2010-04-01 14:06:03.000000000 +0200 +++ new/susedoc-buildbook-0.5/buildbook.sh 2010-05-05 09:17:08.000000000 +0200 @@ -1,7 +1,7 @@ #!/bin/bash TEMP=$(getopt -o e:d:l:n:p:s:u:x \ - --long debug,def:,extdir:,lang:,name:,obsuser:,product:,pdf:,spec:,user: \ + --long 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" @@ -26,6 +26,7 @@ -d|--def) product_file=$2 ; check_file $product_file; shift 2 ;; -l|--lang) LL=$2 ; shift 2 ;; -p|--pdf) pdf=$2 ; check_file $pdf; shift 2 ;; + --prep-local) prep_local=yes ; shift 1 ;; -s|--spec) spec_in=$2; shift 2 ;; -n|--name|--product) product=$2 ; shift 2 ;; -u|--user|--obsuser) obsuser=$2 ; shift 2;; @@ -135,11 +136,22 @@ Summary: -\\ #Provides: locale(desktop-data-openSUSE:$LL)\\ ###PDFOBS" $spec +### hack slepos 11 sp1 FIXME + if [ $product = slepos-guide ]; then + sed -i "s/^###PDFOBS/#PDFOBS/" $spec + fi + if [ -n "$pdfobs" ]; then + sed -i "\ +/^#PDFOBS/i\\ +Obsoletes: $pdfobs\\ +Provides: $pdfobs +" $spec + fi if [ "$pdf_obs" != "" ]; then sed -i "/^#PDFSUB/i\\ $pdf_prov\\ $pdf_obs" $spec - fi + fi sed -i "/^#PDFSUB/i\\ \\ \%description -n ${book}_$LL-pdf\\ @@ -170,7 +182,7 @@ \%defattr(-, root, root)\\ \%doc ${BOOK}_$LL.pdf\\ \%doc $3/LICENSE.txt\\ -/usr/share/help/${book}_$LL-pdf.document\\ +\%{_datadir}/help/${book}_$LL-pdf.document\\ \%dir %{_datadir}/kde4/apps/khelpcenter/plugins\\ \%dir %{_datadir}/kde4/apps/khelpcenter\\ \%dir %{_datadir}/kde4/apps\\ @@ -460,6 +472,10 @@ Obsoletes: $obs\\ Provides: $obs " $spec + ### does not work here; see hack above FIXME + if [ $product = slepos-guide ]; then + sed -i "s/^###PDFOBS/#PDFOBS/" $spec + fi if [ -n "$pdfobs" ]; then sed -i "\ /^#PDFOBS/i\\ @@ -484,8 +500,10 @@ for l in $obs; do # skip books shipped as stand-alone PDFs since 11.1 case $l in - opensuse-kdequick_$LL|opensuse-gnomequick_$LL|apparmor-admin_$LL|opensuse-gnomeuser_$LL|opensuse-kdeuser_$LL) true ;; - *) pdfobs="$pdfobs ${l}-pdf" ;; + opensuse-kdequick_$LL|opensuse-gnomequick_$LL|apparmor-admin_$LL|opensuse-gnomeuser_$LL|opensuse-kdeuser_$LL) true + ;; + *) pdfobs="$pdfobs ${l}-pdf" + ;; esac done # 11.3: opensuse-manuals_$LL-pdf is gone; use the base package @@ -497,6 +515,11 @@ obs="$obs sled-deployment_$LL sled-gnome-user_$LL sled-kde-user_$LL" obs="$obs sled-desktop-qs_$LL sled-install-qs_$LL" set_obs_in_spec + elif [ $product = slepos-guide ]; then + # obsolete since sle11 sp1; see bnc#602450 + obs="slepos-admin_$LL slepos-install_$LL SLEPOS_$LL" + pdfobs="slepos-united_$LL-pdf" + set_obs_in_spec else # gnomeuser and similar books sed -i '/.*my_prov_obs.*/d' $spec @@ -585,6 +608,14 @@ sed -i "\ s:@version@:${PACK_VER:-$version}: " $spec + ## FIXME: + if [ $LL != en ]; then + sed -i "\ +s:^%dir %{_datadir}/help:%dir %{_datadir}/help\n%dir %{_datadir}/help/LOCALE\n%dir %{_datadir}/help/LOCALE/$LL: +s:^%{_datadir}/help/:%{_datadir}/help/LOCALE/$LL/: +/^\(%dir \)*%{_datadir}\/kde4/d +" $spec + fi cp -vp autobuild/* home:$obsuser:branches:$repo/$package ### cd home:$obsuser:branches:$repo/$package @@ -621,6 +652,6 @@ echo $((no++)) >/dev/null done < <(grep -v ^# $product_file) -prep_xbs $xbs_server $xbs_prj +[ -n "$prep_local" ] || prep_xbs $xbs_server $xbs_prj exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc-buildbook-0.4/configure new/susedoc-buildbook-0.5/configure --- old/susedoc-buildbook-0.4/configure 2010-04-01 13:51:04.000000000 +0200 +++ new/susedoc-buildbook-0.5/configure 2010-05-05 09:34:08.000000000 +0200 @@ -2205,7 +2205,7 @@ # Define the identity of the package. PACKAGE=susedoc-buildbook - VERSION=0.4 + VERSION=0.5 cat >>confdefs.h <<_ACEOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc-buildbook-0.4/configure.ac new/susedoc-buildbook-0.5/configure.ac --- old/susedoc-buildbook-0.4/configure.ac 2010-04-01 13:43:13.000000000 +0200 +++ new/susedoc-buildbook-0.5/configure.ac 2010-04-22 08:46:25.000000000 +0200 @@ -1,4 +1,4 @@ AC_INIT([book.spec.in]) -AM_INIT_AUTOMAKE([susedoc-buildbook], [0.4]) +AM_INIT_AUTOMAKE([susedoc-buildbook], [0.5]) 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
participants (1)
-
root@hilbert.suse.de