Hello community,
here is the log from the commit of package opensuse-manuals_de for
openSUSE:12.3 checked in at 2013-02-04 21:15:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.3/opensuse-manuals_de (Old)
and /work/SRC/openSUSE:12.3/.opensuse-manuals_de.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opensuse-manuals_de", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:12.3/opensuse-manuals_de/opensuse-manuals_de.changes
2013-01-31 01:29:10.000000000 +0100
+++
/work/SRC/openSUSE:12.3/.opensuse-manuals_de.new/opensuse-manuals_de.changes
2013-02-04 21:15:37.000000000 +0100
@@ -1,0 +2,14 @@
+Mon Feb 4 13:17:46 UTC 2013 - [email protected]
+
+- Update text and image files (Last Changed Rev.: 2564:9556M).
+- Because of java trouble (missing xml-commons-jaxp-1.3.apis?) disable
+ the Tuning Guide.
+
+-------------------------------------------------------------------
+Thu Jan 31 14:48:22 UTC 2013 - [email protected]
+
+- Update text and image files (Last Changed Rev.: 2564:9556).
+
+
+
+-------------------------------------------------------------------
Old:
----
opensuse-html_de.tar.bz2
New:
----
opensuse-html_de_src_set.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ opensuse-manuals_de.spec ++++++
--- /var/tmp/diff_new_pack.v40hcK/_old 2013-02-04 21:15:38.000000000 +0100
+++ /var/tmp/diff_new_pack.v40hcK/_new 2013-02-04 21:15:38.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package opensuse-manuals_de
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,12 +25,10 @@
#BREQ
Provides: locale(desktop-data-openSUSE:de)
#OBS
-Source: opensuse-html_de.tar.bz2
-#Source01: opensuse-html_de-graphics.tar.bz2
+Source: opensuse-html_de_src_set.tar.bz2
#SOURCES
Source901: doc_pre_checkin.sh
Source903: attributes
-Source999: docbook.xsl
BuildRequires: daps
BuildRequires: fdupes
BuildRequires: suse-xsl-stylesheets
@@ -112,24 +110,13 @@
information about any security-relevant events.
%package -n opensuse-kvm_de-pdf
-Summary: -
+Summary: openSUSE manual: KVM Guide (PDF, English)
Group: Documentation/SUSE
#Provides: locale(desktop-data-openSUSE:de)
###PDFOBS
%description -n opensuse-kvm_de-pdf
--
-
-%package -n opensuse-tuning_de-pdf
-Summary: -
-Group: Documentation/SUSE
-#Provides: locale(desktop-data-openSUSE:de)
-###PDFOBS
-
-%description -n opensuse-tuning_de-pdf
--
-
-#PDFSUB
+This guide introduces basic concepts of virtualization with KVM.
%prep
#%%setup -c -q
@@ -144,16 +131,13 @@
cd %{my_all_dir}
daps -v -d DC-opensuse-html html --static
echo "$(daps -d DC-opensuse-html html-dir-name)" > %{name}.filelist
-# guess directory with profiled sources
-profiled_dir=$(ls -d build/.profiled/*)
-# Find $MAIN
-. ./DC-opensuse-html
-xsltproc -xinclude --stringparam packagename opensuse-html %{S:999} \
- $profiled_dir/$MAIN > %{name}.page
-# /usr/share/help/C/gnome-help/opensuse-manuals.page
+# e.g., /usr/share/help/C/gnome-help/opensuse-manuals.page
# Produce .document files for HTML
-daps -d DC-opensuse-html document-files-html
-document_files_dir=$(daps -d DC-opensuse-html document-files-dir-name | sed
/^Hint.*/d)
+daps -d DC-opensuse-html package-html --documentfiles --pagefiles
+ls -l build/%my_book/package
+document_files_dir=build/%my_book/package
+# copy .page file
+cp $document_files_dir/*.page %name.page
sed -i "
s|@PATH@|file://%{_docdir}/%{name}|
s|^\(Name.*=.*\)|\1 (%{my_lang})|
@@ -175,8 +159,7 @@
Categories=System;Core;Translation;Documentation
s/^X-DOC-Identifier=/DocIdentifier=com.suse./
s/^X-DOC-Weight/DocWeight/
-" $(daps -d DC-opensuse-html document-files-dir-name | sed
/^Hint.*/d)/index.html.document \
- > desktop/%{name}.desktop
+" $document_files_dir/index.html.document > desktop/%{name}.desktop
sed "s/^[Desktop Entry]/[Document]/" desktop/%{name}.desktop \
> yelp/%{name}.document
{ echo desktop/%{name}.desktop; echo yelp/%{name}.document; } >>
%{name}.filelist
@@ -184,37 +167,57 @@
#MAKE_DOC
export XEP_LICENSE=/etc/xep/license.xml
export XEP_HOME=/usr/share/xep
+# see https://sourceforge.net/p/daps/tickets/107/
+export XEP_OPTIONS="-valid"
# export FOP=fop
export FOP_STACK="-Xss2048K"
build_pdf () {
%if %{with PDF}
+ book=$(echo ${1} | tr [:upper:] [:lower:])
+ if [ -x /usr/bin/xep ]; then
+ formatter=xep
+ fi
if [ -z "$formatter" ]; then
formatter=$(daps -d DC-${1} showvariable VARIABLE=FORMATTER)
fi
+# if [ $formatter = fop ]; then
+# # bnc#778567
+# daps -v -d DC-${1} pdf-color --xsltparam "'--param hyphenate.verbatim 0'"
+# else
+# daps -v -d DC-${1} pdf-color --formatter=$formatter
+# fi
+ # pdf-color-name does not support --formatter
+ # pdfname=$(daps -d DC-${1} pdf-color-name | sed /^Hint.*/d)
+ # echo "$pdfname" > ${1}_de-pdf.filelist
if [ $formatter = fop ]; then
# bnc#778567
- daps -v -d DC-${1} pdf-color --xsltparam "'--param hyphenate.verbatim 0'"
+ # right now, daps 1.1.2 does not support --xsltparam
+ # FIXME: Tut so naed -- ask Magic
+ pkg_pdf=$(daps -d DC-${1} package-pdf --formatter=$formatter
--documentfiles XSLTPARAM='\\\"--param hyphenate.verbatim 0\\\"')
else
- daps -v -d DC-${1} pdf-color
+ daps -d DC-${1} package-pdf --formatter=$formatter
+ pkg_pdf=$(daps -d DC-${1} package-pdf --formatter=$formatter
--documentfiles)
fi
- pdfname=$(daps -d DC-${1} pdf-color-name | sed /^Hint.*/d)
- echo "$pdfname" > ${1}_de-pdf.filelist
- daps -d DC-${1} document-files-pdf
- sed "
+ pdfname=$(find $pkg_pdf -name '*.pdf')
+ docname=$(find $pkg_pdf -name '*.document')
+ pwd
+ sed -i "
# remove useless comments and search settings
/^Categories=/d
/^DocPath=/d
/^Name *=/i\
Categories=System;Core;Translation;Documentation\n\
DocPath=file://%{_defaultdocdir}/${1}_de-pdf/${pdfname##*/}
-" $(daps -d DC-$1 document-files-dir-name | sed
/^Hint.*/d)/${1}_de-pdf.document \
- > yelp/${1}_de-pdf.document
- echo yelp/${1}_de-pdf.document >> ${1}_de-pdf.filelist
+" $docname
+ {
+ echo $pdfname
+ echo $docname
+ } > ${book}_de-pdf.filelist
%else
: say build --with PDF
%endif
}
-all_pdf_docs=" opensuse-startup opensuse-reference opensuse-security
opensuse-kvm opensuse-tuning"
+all_pdf_docs=" opensuse-startup opensuse-reference opensuse-security
opensuse-kvm"
[ -n "$all_pdf_docs" ] && for b in $all_pdf_docs; do build_pdf $b; done
%install
@@ -232,23 +235,32 @@
%suse_update_desktop_file '%{name}'
if [ %{my_lang} = en ]; then
yelp_document_dir=%{_datadir}/help
+ yelp_link_dir=$yelp_document_dir/C
gnome_help_dir=%{_datadir}/help/C/gnome-help
{
echo "%dir $yelp_document_dir"
+ echo "%dir $yelp_link_dir"
+ echo "%dir $yelp_link_dir/%my_book"
echo "%dir $gnome_help_dir"
} > %name.filelist
else
yelp_document_dir=%{_datadir}/help/LOCALE/%{my_lang}
+ yelp_link_dir=$yelp_document_dir
gnome_help_dir=%{_datadir}/help/LOCALE/%{my_lang}/gnome-help
{
echo "%dir %{_datadir}/help/LOCALE"
echo "%dir %{_datadir}/help/LOCALE/%{my_lang}"
echo "%dir $yelp_document_dir"
+ echo "%dir $yelp_link_dir/%my_book"
echo "%dir $gnome_help_dir"
} > %name.filelist
fi
mkdir -p %{buildroot}$yelp_document_dir
cp yelp/%{name}.document %{buildroot}$yelp_document_dir
+mkdir -p %{buildroot}$yelp_link_dir
+pushd %{buildroot}$yelp_link_dir
+ln -sf %{_defaultdocdir}/%name %my_book
+popd
mkdir -p %{buildroot}$gnome_help_dir
cp %name.page %{buildroot}$gnome_help_dir/%name.page
{
@@ -258,15 +270,19 @@
%if %{with PDF}
for f in *-pdf.filelist; do
+ # cat $f
mkdir %{buildroot}/%{_defaultdocdir}/${f%\.filelist}
+ # PDF first
cp -a --dereference $(head -n 1 $f) \
%{buildroot}/%{_defaultdocdir}/${f%\.filelist}
+ # remove first line and append the new location
sed -i 1d $f
echo "%{_defaultdocdir}/${f%\.filelist}" >> $f
- cp $(head -n 1 $f) \
- %{buildroot}/%{_datadir}/help
+ # now .document
+ doc=$(head -n 1 $f)
+ cp $doc %{buildroot}/%{_datadir}/help
sed -i 1d $f
- echo "%{_datadir}/help/${f%\.filelist}.document" >> $f
+ echo "%{_datadir}/help/${doc##*/}" >> $f
done
%endif
@@ -291,9 +307,6 @@
%files -n opensuse-kvm_de-pdf -f %{my_book}/opensuse-kvm_de-pdf.filelist
%defattr(-, root, root)
-%files -n opensuse-tuning_de-pdf -f %{my_book}/opensuse-tuning_de-pdf.filelist
-%defattr(-, root, root)
-
#PDFFILES
%files -f %{my_book}/%{name}.filelist
++++++ attributes ++++++
--- /var/tmp/diff_new_pack.v40hcK/_old 2013-02-04 21:15:38.000000000 +0100
+++ /var/tmp/diff_new_pack.v40hcK/_new 2013-02-04 21:15:38.000000000 +0100
@@ -107,15 +107,15 @@
+description.opensuse-installquick_de-pdf
A quick start guide providing a walk-through to the default installation.
-description.opensuse-installquick_de-pdf
-group.opensuse-kvm_en Documentation/SUSE
-license.opensuse-kvm_en-pdf GFDL-1.2
-summary.opensuse-kvm_en-pdf openSUSE manual: KVM Guide (PDF, English)
-+description.opensuse-kvm_en-pdf
+group.opensuse-kvm_de Documentation/SUSE
+license.opensuse-kvm_de-pdf GFDL-1.2
+summary.opensuse-kvm_de-pdf openSUSE manual: KVM Guide (PDF, English)
++description.opensuse-kvm_de-pdf
This guide introduces basic concepts of virtualization with KVM.
--description.opensuse-kvm_en-pdf
-group.opensuse-tuning_en Documentation/SUSE
-license.opensuse-tuning_en-pdf GFDL-1.2
-summary.opensuse-tuning_en-pdf openSUSE manual: Tuning Guide (PDF, English)
-+description.opensuse-tuning_en-pdf
+-description.opensuse-kvm_de-pdf
+group.opensuse-tuning_de Documentation/SUSE
+license.opensuse-tuning_de-pdf GFDL-1.2
+summary.opensuse-tuning_de-pdf openSUSE manual: Tuning Guide (PDF, English)
++description.opensuse-tuning_de-pdf
This guide introduces basic concepts of system tuning.
--description.opensuse-tuning_en-pdf
+-description.opensuse-tuning_de-pdf
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
