commit opensuse-manuals_ja for openSUSE:Factory
30 Jan
2013
30 Jan
'13
21:23
Hello community, here is the log from the commit of package opensuse-manuals_ja for openSUSE:Factory checked in at 2013-01-30 22:23:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opensuse-manuals_ja (Old) and /work/SRC/openSUSE:Factory/.opensuse-manuals_ja.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "opensuse-manuals_ja", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/opensuse-manuals_ja/opensuse-manuals_ja.changes 2012-11-02 17:38:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.opensuse-manuals_ja.new/opensuse-manuals_ja.changes 2013-01-30 22:23:05.000000000 +0100 @@ -1,0 +2,11 @@ +Wed Jan 30 11:17:54 UTC 2013 - belphegor@belbel.or.jp + +- updated to SVN#10222 +- fix build error according to opensuse-manuals_en + +------------------------------------------------------------------- +Tue Nov 6 11:26:44 UTC 2012 - belphegor@belbel.or.jp + +- updated to SVN #9678 (added AutoYaST) + +------------------------------------------------------------------- Old: ---- opensuse-html_ja.tar.bz2 New: ---- opensuse-html_ja_src_set.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opensuse-manuals_ja.spec ++++++ --- /var/tmp/diff_new_pack.0qH13O/_old 2013-01-30 22:23:07.000000000 +0100 +++ /var/tmp/diff_new_pack.0qH13O/_new 2013-01-30 22:23:07.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package opensuse-manuals_ja # -# 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 @@ -26,12 +26,10 @@ Provides: apparmor-admin_ja = %{version} Provides: locale(desktop-data-openSUSE:ja) #OBS -Source: opensuse-html_ja.tar.bz2 -#Source01: opensuse-html_ja-graphics.tar.bz2 +Source: opensuse-html_ja_src_set.tar.bz2 #SOURCES Source901: doc_pre_checkin.sh Source903: attributes -Source999: docbook.xsl BuildRequires: daps BuildRequires: fdupes BuildRequires: suse-xsl-stylesheets @@ -153,17 +151,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/*) -. ./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})| @@ -185,8 +181,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 @@ -198,20 +193,46 @@ export FOP_STACK="-Xss2048K" build_pdf () { %if %{with PDF} - daps -v --envfile DC-${1} pdf-color --xsltparam "'--param hyphenate.verbatim 0'" - pdfname=$(daps --envfile DC-${1} pdf-color-name | sed /^Hint.*/d) - echo "$pdfname" > ${1}_ja-pdf.filelist - daps --envfile DC-${1} document-files-pdf - sed " + 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}_ja-pdf.filelist + if [ $formatter = fop ]; then + # bnc#778567 + # 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\\\"') + # pkg_pdf=$(daps -d DC-${1} package-pdf --formatter=$formatter --documentfiles) +else + daps -d DC-${1} package-pdf --formatter=$formatter + pkg_pdf=$(daps -d DC-${1} package-pdf --formatter=$formatter --documentfiles) + fi + 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}_ja-pdf/${pdfname##*/} -" $(daps --envfile DC-$1 document-files-dir-name | sed /^Hint.*/d)/${1}_ja-pdf.document \ - > yelp/${1}_ja-pdf.document - echo yelp/${1}_ja-pdf.document >> ${1}_ja-pdf.filelist +" $docname + { + echo $pdfname + echo $docname + } > ${book}_ja-pdf.filelist %else : say build --with PDF %endif @@ -234,23 +255,32 @@ %suse_update_desktop_file '%{name}' if [ %{my_lang} = ja ]; 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 { @@ -260,15 +290,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 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
4128
Age (days ago)
4128
Last active (days ago)
0 comments
1 participants
participants (1)
-
root@hilbert.suse.de