Hello community,
here is the log from the commit of package opensuse-manuals_de for
openSUSE:Factory checked in at 2012-10-19 08:49:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/opensuse-manuals_de (Old)
and /work/SRC/openSUSE:Factory/.opensuse-manuals_de.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opensuse-manuals_de", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/opensuse-manuals_de/opensuse-manuals_de.changes
2012-08-22 12:15:27.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.opensuse-manuals_de.new/opensuse-manuals_de.changes
2012-10-19 08:49:16.000000000 +0200
@@ -1,0 +2,16 @@
+Thu Oct 18 12:32:27 UTC 2012 - [email protected]
+
+- Update text and image files (Last Changed Rev.: 2564:9556).
+
+-------------------------------------------------------------------
+Wed Aug 29 11:43:15 UTC 2012 - [email protected]
+
+- Update text and image files; bnc#777832.
+
+-------------------------------------------------------------------
+Wed Aug 22 12:24:00 UTC 2012 - [email protected]
+
+- Update text and image files.
+- Add gnome-help related meta fieles.
+
+-------------------------------------------------------------------
New:
----
docbook.xsl
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ opensuse-manuals_de.spec ++++++
--- /var/tmp/diff_new_pack.61fhgg/_old 2012-10-19 08:49:17.000000000 +0200
+++ /var/tmp/diff_new_pack.61fhgg/_new 2012-10-19 08:49:17.000000000 +0200
@@ -14,6 +14,8 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
+
%bcond_without PDF
Name: opensuse-manuals_de
%define my_lang de
@@ -28,13 +30,14 @@
#SOURCES
Source901: doc_pre_checkin.sh
Source903: attributes
+Source999: docbook.xsl
BuildRequires: daps
BuildRequires: fdupes
BuildRequires: suse-xsl-stylesheets
# Also buildrequire tools that susedoc does not pull in automatically ATM
-BuildRequires: python-xml
-BuildRequires: python-lxml
BuildRequires: poppler-tools
+BuildRequires: python-lxml
+BuildRequires: python-xml
BuildRequires: update-desktop-files
BuildRequires: xerces-j2
%if 0%{?suse_version} >= 1140
@@ -139,8 +142,15 @@
%build
%define my_all_dir %{_builddir}/%{name}-%{version}/opensuse-html
cd %{my_all_dir}
-daps -d DC-opensuse-html html --static
+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
# 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)
@@ -178,11 +188,18 @@
export FOP_STACK="-Xss2048K"
build_pdf () {
%if %{with PDF}
- daps --envfile DC-${1} pdf-color
- pdfname=$(daps --envfile DC-${1} pdf-color-name | sed /^Hint.*/d)
+ 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
+ fi
+ pdfname=$(daps -d DC-${1} pdf-color-name | sed /^Hint.*/d)
echo "$pdfname" > ${1}_de-pdf.filelist
- daps --envfile DC-${1} document-files-pdf
-### NEW - use %%my_lang!
+ daps -d DC-${1} document-files-pdf
sed "
# remove useless comments and search settings
/^Categories=/d
@@ -190,11 +207,9 @@
/^Name *=/i\
Categories=System;Core;Translation;Documentation\n\
DocPath=file://%{_defaultdocdir}/${1}_de-pdf/${pdfname##*/}
-" $(daps --envfile DC-$1 document-files-dir-name | sed
/^Hint.*/d)/${1}_de-pdf.document \
+" $(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
- # debugging
- cat ${1}_de-pdf.filelist
%else
: say build --with PDF
%endif
@@ -212,18 +227,34 @@
cp -a --dereference $(head -n 1 %{name}.filelist) \
%{buildroot}/%{_defaultdocdir}/%{name}
mkdir -p %{buildroot}/%{_datadir}/kde4/apps/khelpcenter/plugins
-mkdir %{buildroot}/%{_datadir}/help
cp desktop/%{name}.desktop \
%{buildroot}/%{_datadir}/kde4/apps/khelpcenter/plugins
%suse_update_desktop_file '%{name}'
-### NEW
if [ %{my_lang} = en ]; then
- cp yelp/%{name}.document %{buildroot}/%{_datadir}/help
+ yelp_document_dir=%{_datadir}/help
+ gnome_help_dir=%{_datadir}/help/C/gnome-help
+ {
+ echo "%dir $yelp_document_dir"
+ echo "%dir $gnome_help_dir"
+ } > %name.filelist
else
- locale_dir=%{buildroot}/%{_datadir}/help/LOCALE/%{my_lang}
- mkdir -p $locale_dir
- cp yelp/%{name}.document $locale_dir
+ yelp_document_dir=%{_datadir}/help/LOCALE/%{my_lang}
+ 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 $gnome_help_dir"
+ } > %name.filelist
fi
+mkdir -p %{buildroot}$yelp_document_dir
+cp yelp/%{name}.document %{buildroot}$yelp_document_dir
+mkdir -p %{buildroot}$gnome_help_dir
+cp %name.page %{buildroot}$gnome_help_dir/%name.page
+{
+ echo "$yelp_document_dir/%{name}.document"
+ echo "$gnome_help_dir/%name.page"
+} >> %name.filelist
%if %{with PDF}
for f in *-pdf.filelist; do
@@ -236,8 +267,6 @@
%{buildroot}/%{_datadir}/help
sed -i 1d $f
echo "%{_datadir}/help/${f%\.filelist}.document" >> $f
- # debugging
- cat $f
done
%endif
@@ -252,71 +281,26 @@
%files -n opensuse-startup_de-pdf -f
%{my_book}/opensuse-startup_de-pdf.filelist
%defattr(-, root, root)
-### %%doc build/opensuse-startup/package/pdf/opensuse-startup_de.pdf
-### %%{_datadir}/help/opensuse-startup_de-pdf.document
-### %%dir %%{_datadir}/kde4/apps/khelpcenter/plugins
-### %%dir %%{_datadir}/kde4/apps/khelpcenter
-### %%dir %%{_datadir}/kde4/apps
-### %%dir %%{_datadir}/kde4
-### %%{_datadir}/kde4/apps/khelpcenter/plugins/opensuse-startup_de-pdf.desktop
-###
%files -n opensuse-reference_de-pdf -f
%{my_book}/opensuse-reference_de-pdf.filelist
%defattr(-, root, root)
-### %%doc build/opensuse-reference/package/pdf/opensuse-reference_de.pdf
-### %%{_datadir}/help/opensuse-reference_de-pdf.document
-### %%dir %%{_datadir}/kde4/apps/khelpcenter/plugins
-### %%dir %%{_datadir}/kde4/apps/khelpcenter
-### %%dir %%{_datadir}/kde4/apps
-### %%dir %%{_datadir}/kde4
-###
%%{_datadir}/kde4/apps/khelpcenter/plugins/opensuse-reference_de-pdf.desktop
-###
%files -n opensuse-security_de-pdf -f
%{my_book}/opensuse-security_de-pdf.filelist
%defattr(-, root, root)
-### %%doc build/opensuse-security/package/pdf/opensuse-security_de.pdf
-### %%{_datadir}/help/opensuse-security_de-pdf.document
-### %%dir %%{_datadir}/kde4/apps/khelpcenter/plugins
-### %%dir %%{_datadir}/kde4/apps/khelpcenter
-### %%dir %%{_datadir}/kde4/apps
-### %%dir %%{_datadir}/kde4
-### %%{_datadir}/kde4/apps/khelpcenter/plugins/opensuse-security_de-pdf.desktop
-###
%files -n opensuse-kvm_de-pdf -f %{my_book}/opensuse-kvm_de-pdf.filelist
%defattr(-, root, root)
-### %%doc build/opensuse-kvm/package/pdf/opensuse-kvm_de.pdf
-### %%{_datadir}/help/opensuse-kvm_de-pdf.document
-### %%dir %%{_datadir}/kde4/apps/khelpcenter/plugins
-### %%dir %%{_datadir}/kde4/apps/khelpcenter
-### %%dir %%{_datadir}/kde4/apps
-### %%dir %%{_datadir}/kde4
-### %%{_datadir}/kde4/apps/khelpcenter/plugins/opensuse-kvm_de-pdf.desktop
-###
%files -n opensuse-tuning_de-pdf -f %{my_book}/opensuse-tuning_de-pdf.filelist
%defattr(-, root, root)
-### %%doc build/opensuse-tuning/package/pdf/opensuse-tuning_de.pdf
-### %%{_datadir}/help/opensuse-tuning_de-pdf.document
-### %%dir %%{_datadir}/kde4/apps/khelpcenter/plugins
-### %%dir %%{_datadir}/kde4/apps/khelpcenter
-### %%dir %%{_datadir}/kde4/apps
-### %%dir %%{_datadir}/kde4
-### %%{_datadir}/kde4/apps/khelpcenter/plugins/opensuse-tuning_de-pdf.desktop
-###
#PDFFILES
-%files
+%files -f %{my_book}/%{name}.filelist
%defattr(-, root, root)
%dir %{_defaultdocdir}
%{_defaultdocdir}/%{name}
#GNOME
-%dir %{_datadir}/help
-%dir %{_datadir}/help/LOCALE
-%dir %{_datadir}/help/LOCALE/de
-%{_datadir}/help/LOCALE/de/%{name}.document
-### NEW
#KDE4
%dir %{_datadir}/kde4/apps/khelpcenter/plugins
%dir %{_datadir}/kde4/apps/khelpcenter
++++++ opensuse-html_de.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/opensuse-manuals_de/opensuse-html_de.tar.bz2
/work/SRC/openSUSE:Factory/.opensuse-manuals_de.new/opensuse-html_de.tar.bz2
differ: char 11, line 1
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
