commit opensuse-manuals_ja for openSUSE:Factory
31 Jul
2013
31 Jul
'13
15:23
Hello community, here is the log from the commit of package opensuse-manuals_ja for openSUSE:Factory checked in at 2013-07-31 17:23:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opensuse-manuals_ja (Old) and /work/SRC/openSUSE:Factory/.opensuse-manuals_ja.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "opensuse-manuals_ja" Changes: -------- --- /work/SRC/openSUSE:Factory/opensuse-manuals_ja/opensuse-manuals_ja.changes 2013-03-04 17:29:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.opensuse-manuals_ja.new/opensuse-manuals_ja.changes 2013-07-31 17:23:33.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Jul 30 22:52:23 UTC 2013 - belphegor@belbel.or.jp + +- fixed coflict at /usr/share/help/C/opensuse-html + (use /usr/share/help/LOCALE/ja instead; OBS req#184282) + +------------------------------------------------------------------- +Thu Jul 25 00:21:10 UTC 2013 - belphegor@belbel.or.jp + +- remove dir modifier from symlink in filelist + (changed at opensuse-manuals_en) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opensuse-manuals_ja.spec ++++++ --- /var/tmp/diff_new_pack.f7UZMA/_old 2013-07-31 17:23:34.000000000 +0200 +++ /var/tmp/diff_new_pack.f7UZMA/_new 2013-07-31 17:23:34.000000000 +0200 @@ -32,18 +32,18 @@ Source903: attributes BuildRequires: daps BuildRequires: fdupes -BuildRequires: suse-xsl-stylesheets +BuildRequires: suse-xsl-stylesheets >= 1.9.18 # Also buildrequire tools that susedoc does not pull in automatically ATM -BuildRequires: poppler-tools -BuildRequires: python-lxml -BuildRequires: python-xml +# BuildRequires: python-xml +# BuildRequires: python-lxml +# BuildRequires: poppler-tools BuildRequires: update-desktop-files -BuildRequires: xerces-j2 -%if 0%{?suse_version} >= 1140 -BuildRequires: xmlgraphics-fop -%else -BuildRequires: fop -%endif +# BuildRequires: xerces-j2 +# %%if 0%%{?suse_version} >= 1140 +# BuildRequires: xmlgraphics-fop +# %%else +# BuildRequires: fop +# %%endif # BEGIN - Japanese environment BuildRequires: IPAGothic BuildRequires: IPAGothic_Bold @@ -151,15 +151,13 @@ %build %define my_all_dir %{_builddir}/%{name}-%{version}/opensuse-html cd %{my_all_dir} -# FIXME -# daps -v -d DC-opensuse-html profile -daps -v -d DC-opensuse-html html --static -echo "$(daps -d DC-opensuse-html html-dir-name)" > %{name}.filelist # e.g., /usr/share/help/C/gnome-help/opensuse-manuals.page # Produce .document files for HTML -daps -d DC-opensuse-html package-html --documentfiles --pagefiles -ls -l build/%my_book/package -document_files_dir=build/%my_book/package +package_dir=$(daps -d DC-opensuse-html package-html --documentfiles --pagefiles) +tar xvf $package_dir/opensuse-html_%{my_lang}-html.tar.bz2 +echo opensuse-html > %{name}.filelist +# ls -l build/%my_book/package +document_files_dir=$package_dir # copy .page file cp $document_files_dir/*.page %name.page sed -i " @@ -184,6 +182,7 @@ s/^X-DOC-Identifier=/DocIdentifier=com.suse./ s/^X-DOC-Weight/DocWeight/ " $document_files_dir/index.html.document > desktop/%{name}.desktop +# FIXME: check whether it is still needed (move to daps?) sed "s/^[Desktop Entry]/[Document]/" desktop/%{name}.desktop \ > yelp/%{name}.document { echo desktop/%{name}.desktop; echo yelp/%{name}.document; } >> %{name}.filelist @@ -257,14 +256,15 @@ cp desktop/%{name}.desktop \ %{buildroot}/%{_datadir}/kde4/apps/khelpcenter/plugins %suse_update_desktop_file '%{name}' -if [ %{my_lang} = ja ]; then +# MUST NOT BE CHANGED "%{my_lang} = en" +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 "$yelp_link_dir/%my_book" echo "%dir $gnome_help_dir" } > %name.filelist else @@ -275,7 +275,7 @@ 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 "$yelp_link_dir/%my_book" echo "%dir $gnome_help_dir" } > %name.filelist fi ++++++ opensuse-html_ja_src_set.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/opensuse-manuals_ja/opensuse-html_ja_src_set.tar.bz2 /work/SRC/openSUSE:Factory/.opensuse-manuals_ja.new/opensuse-html_ja_src_set.tar.bz2 differ: char 1, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
3929
Age (days ago)
3929
Last active (days ago)
0 comments
1 participants
participants (1)
-
root@hilbert.suse.de