Hello community,
here is the log from the commit of package opensuse-manuals_ru for
openSUSE:Factory checked in at 2013-02-05 15:44:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/opensuse-manuals_ru (Old)
and /work/SRC/openSUSE:Factory/.opensuse-manuals_ru.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opensuse-manuals_ru", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/opensuse-manuals_ru/opensuse-manuals_ru.changes
2012-11-02 17:39:26.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.opensuse-manuals_ru.new/opensuse-manuals_ru.changes
2013-02-05 15:44:55.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Feb 5 13:18:44 UTC 2013 - [email protected]
+
+- Update text and image files (Last Changed Rev.: 16:9929).
+
+-------------------------------------------------------------------
Old:
----
opensuse-manuals_ru-12.1.9028.tar.bz2
New:
----
opensuse-html_ru_src_set.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ opensuse-manuals_ru.spec ++++++
--- /var/tmp/diff_new_pack.BSRhq6/_old 2013-02-05 15:44:57.000000000 +0100
+++ /var/tmp/diff_new_pack.BSRhq6/_new 2013-02-05 15:44:57.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package opensuse-manuals_ru
#
-# 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
@@ -19,19 +19,16 @@
%bcond_without PDF
Name: opensuse-manuals_ru
%define my_lang ru
-Version: 12.1.9028
+%define my_book opensuse-html
+Version: 12.2
Release: 0
-Url: http://ru.opensuse.org/openSUSE:Перевод_документации
#BREQ
-Provides: apparmor-admin_ru = %{version}
Provides: locale(desktop-data-openSUSE:ru)
#OBS
-Source: %{name}-%{version}.tar.bz2
-#Source01: opensuse-html_ru-graphics.tar.bz2
+Source: opensuse-html_ru_src_set.tar.bz2
#SOURCES
Source901: doc_pre_checkin.sh
Source903: attributes
-Source999: docbook.xsl
BuildRequires: daps
BuildRequires: fdupes
BuildRequires: suse-xsl-stylesheets
@@ -51,11 +48,10 @@
Summary: Complete set of openSUSE Manuals (HTML, Russian)
License: GFDL-1.2
Group: Documentation/SUSE
+Url: http://doc.opensuse.org
%define _defaultdocdir %{_datadir}/doc/manual
%define _docdir %{_datadir}/doc/manual
-Obsoletes: apparmor-admin_ru < 12.2
-
%description
Contains the complete official openSUSE documentation in HTML
format. It can be accessed via the Desktop's help centers.
@@ -132,28 +128,25 @@
This guide introduces basic concepts of system tuning.
%prep
-%setup
-#%setup -c -n %{name}-%{version}/opensuse-html
+#%%setup -c -q
+%setup -c -q -n %{name}-%{version}/opensuse-html
#PREP
-#%setup -c -T -D -n %{name}-%{version}
+%setup -c -q -T -D -n %{name}-%{version}
find -name '*.png' -o -name '*.svg' | xargs chmod 644 || :
#PDFPREP
%build
-#%define my_all_dir %{_builddir}/%{name}-%{version}/opensuse-html
-#cd %{my_all_dir}
+%define my_all_dir %{_builddir}/%{name}-%{version}/opensuse-html
+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 +168,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,32 +176,52 @@
#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}_ru-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}_ru-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}_ru-pdf/${pdfname##*/}
-" $(daps -d DC-$1 document-files-dir-name | sed
/^Hint.*/d)/${1}_ru-pdf.document \
- > yelp/${1}_ru-pdf.document
- echo yelp/${1}_ru-pdf.document >> ${1}_ru-pdf.filelist
+" $docname
+ {
+ echo $pdfname
+ echo $docname
+ } > ${book}_ru-pdf.filelist
%else
: say build --with PDF
%endif
@@ -218,7 +230,7 @@
[ -n "$all_pdf_docs" ] && for b in $all_pdf_docs; do build_pdf $b; done
%install
-#cd %{my_all_dir}
+cd %{my_all_dir}
mkdir -p %{buildroot}%{_defaultdocdir}
# product is name without language code
%define gnome_dir %{_datadir}/gnome/help/opensuse-manuals
@@ -232,23 +244,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 +279,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
@@ -279,24 +304,24 @@
#PDFXXX
-%files -n opensuse-startup_ru-pdf -f opensuse-startup_ru-pdf.filelist
+%files -n opensuse-startup_ru-pdf -f
%{my_book}/opensuse-startup_ru-pdf.filelist
%defattr(-, root, root)
-%files -n opensuse-reference_ru-pdf -f opensuse-reference_ru-pdf.filelist
+%files -n opensuse-reference_ru-pdf -f
%{my_book}/opensuse-reference_ru-pdf.filelist
%defattr(-, root, root)
-%files -n opensuse-security_ru-pdf -f opensuse-security_ru-pdf.filelist
+%files -n opensuse-security_ru-pdf -f
%{my_book}/opensuse-security_ru-pdf.filelist
%defattr(-, root, root)
-%files -n opensuse-kvm_ru-pdf -f opensuse-kvm_ru-pdf.filelist
+%files -n opensuse-kvm_ru-pdf -f %{my_book}/opensuse-kvm_ru-pdf.filelist
%defattr(-, root, root)
-%files -n opensuse-tuning_ru-pdf -f opensuse-tuning_ru-pdf.filelist
+%files -n opensuse-tuning_ru-pdf -f %{my_book}/opensuse-tuning_ru-pdf.filelist
%defattr(-, root, root)
#PDFFILES
-%files -f %{name}.filelist
+%files -f %{my_book}/%{name}.filelist
%defattr(-, root, root)
%dir %{_defaultdocdir}
%{_defaultdocdir}/%{name}
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
