Hello community, here is the log from the commit of package opensuse-manual_en checked in at Thu Nov 8 22:50:05 CET 2007. -------- --- opensuse-manual_en/opensuse-manual_en.changes 2007-10-29 15:30:54.000000000 +0100 +++ /mounts/work_src_done/NOARCH/opensuse-manual_en/opensuse-manual_en.changes 2007-11-07 14:10:02.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 7 14:08:06 CET 2007 - ke@suse.de + +- Correct X-DOC-Weight using better style-sheet support. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opensuse-manual_en.spec ++++++ --- /var/tmp/diff_new_pack.m22048/_old 2007-11-08 22:49:36.000000000 +0100 +++ /var/tmp/diff_new_pack.m22048/_new 2007-11-08 22:49:36.000000000 +0100 @@ -15,13 +15,13 @@ %define my_prov_obs suselinux-adminguide_%{my_lang} suselinux-userguide_%{my_lang} suselinux-manual_%{my_lang} %define my_book opensuse-html Version: 10.3 -Release: 42 +Release: 43 Obsoletes: %{my_prov_obs} Provides: %{my_prov_obs} +Provides: locale(desktop-data-SuSE:en) Obsoletes: suselinux-manual_es suselinux-manual_fr suselinux-manual_it suselinux-manual_ja suselinux-manual_pt_BR suselinux-manual_zh_CN suselinux-manual_zh_TW opensuse-quickstart_en Provides: suselinux-manual_es suselinux-manual_fr suselinux-manual_it suselinux-manual_ja suselinux-manual_pt_BR suselinux-manual_zh_CN suselinux-manual_zh_TW opensuse-quickstart_en #OBS -Provides: locale(opensuse-manual_en:%my_lang) Source00: opensuse-html_en-html.tar.bz2 Source01: opensuse-html_en-desktop.tar.bz2 Source10: opensuse-gnomequick_en.pdf @@ -46,6 +46,7 @@ #SOURCES BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch +BuildRequires: update-desktop-files Group: Documentation/SuSE License: GNU Free Documentation License, Version 1.2 (GFDL 1.2) Summary: openSUSE Manual (English) @@ -64,7 +65,7 @@ Group: Documentation/SuSE License: GNU Free Documentation License, Version 1.2 (GFDL 1.2) Summary: openSUSE Manual (English) as PDF -Provides: locale(opensuse-manual_en-pdf:%my_lang) +#Provides: locale(desktop-data-SuSE:en) Obsoletes: suselinux-manual_es-pdf suselinux-manual_fr-pdf suselinux-manual_it-pdf suselinux-manual_ja-pdf suselinux-manual_pt_BR-pdf suselinux-manual_zh_CN-pdf suselinux-manual_zh_TW-pdf opensuse-quickstart_en-pdf Provides: suselinux-manual_es-pdf suselinux-manual_fr-pdf suselinux-manual_it-pdf suselinux-manual_ja-pdf suselinux-manual_pt_BR-pdf suselinux-manual_zh_CN-pdf suselinux-manual_zh_TW-pdf opensuse-quickstart_en-pdf #PDFOBS @@ -78,6 +79,7 @@ #%setup -c -q %setup -c -q -a 01 #PREP +find -name '*.png' -o -name '*.svg' | xargs chmod 644 cp %{S:10} . cp %{S:20} . cp %{S:30} . @@ -89,23 +91,54 @@ %build find . -name CVS -o -name '.xvpics' -o -name '.cvsignore' \ | xargs rm -fr +# make sure index.html exists +for f in $(find html -type f -name 'book.*'); do + pushd ${f%/*} + [ -f index.html -o -L index.html ] || ln -sf ${f##*/} index.html + popd +done %install [ -d $RPM_BUILD_ROOT ] && rm -fvr $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir} +# is set for sles or sled as /sles or /sled %define my_desktopdir /usr/share/susehelp/meta +echo %{my_desktopdir} | sed 's:\(\|xyzy\)::' >filelist # mkdir -p desktop/{startup,reference,application,apparmor-admin-guide} ### install -d $RPM_BUILD_ROOT%{my_desktopdir}/%{name} -%define gnome_dir /usr/share/gnome/help/%{name} -install -d $RPM_BUILD_ROOT/%{gnome_dir} +# product is name without language code +%if %suse_version < 1030 +%define gnome_dir /opt/gnome/share/gnome/help/opensuse-manual +%else +%define gnome_dir %{_datadir}/gnome/help/opensuse-manual +%endif +install -d $RPM_BUILD_ROOT%{gnome_dir} # if [ -d html/%my_book ]; then mv html/%my_book html/manual pushd desktop +# problem writing desktop files on 10.3 +if [ -d index.desktop ]; then + for f in $(find index.desktop -mindepth 1 -maxdepth 1); do + mv $f . + done + rmdir index.desktop +fi +if [ ! -f .directory ]; then + # stand-alone book, hidden in sub-directory + dir=$(find . -maxdepth 1 -type d -name 'book_*') + if [ -n "$dir" ]; then + for f in $(find $dir -mindepth 1 -maxdepth 1); do + mv $f . + done + rmdir $dir + fi +fi for f in $(find . -type f -name '*desktop'); do # /usr/share/doc/manual/suselinux-manual_en/manual - sed -i "s|@PATH@|%{_defaultdocdir}/%{name}/manual| + sed -i "/^X-DOC-Identifier.*/d +s|@PATH@|%{_defaultdocdir}/%{name}/manual| s/\[\]//" $f if ! grep -q -e '^Name *=' $f; then # requiered if no "Name=" is present @@ -122,15 +155,15 @@ s/\[\]// s|@id@|$id|" $f case $d in - *.startup) + *_startup) [ $f = "./.directory" ] \ - && sed -i "s|^\(X-DOC-Weight\).*|\1=-2000|" $f ;; + && sed -i "s|^\(X-DOC-Weight\).*|\1=-10000|" $f ;; esac done popd done # Probably useful for stand-alone books -for f in $(find . -maxdepth 1 -name '*.directory'); do +for f in $(find . -name '*.directory'); do id=%{name} id=${id//_/} sed -i "s|@PATH@|%{_defaultdocdir}/%{name}/manual| @@ -142,21 +175,21 @@ s/^\(Name\|Comment\)\(.*\)/\1\2 (%{my_lang})/' $f fi done -# remove the dots from the file names -for f in $(find . -type f -name '*desktop'); do - d=${f%/*} - n=${f##*/}; n=${n/\.desktop}; n=${n//\./_}; n=${n}.desktop - [ $f = $d/$n ] || mv -v $f $d/$n -done -ren_dir () { - for d in $(find . -maxdepth $1 -mindepth $1 -type d); do - n=${d#*/}; n=${n//\./_} - [ $d = $n ] || mv -v $d $n - done -} -ren_dir 1 -ren_dir 2 -# +# # remove the dots from the file names +# for f in $(find . -type f -name '*desktop'); do +# d=${f%/*} +# n=${f##*/}; n=${n/\.desktop}; n=${n//\./_}; n=${n}.desktop +# [ $f = $d/$n ] || mv -v $f $d/$n +# done +# ren_dir () { +# for d in $(find . -maxdepth $1 -mindepth $1 -type d); do +# n=${d#*/}; n=${n//\./_} +# [ $d = $n ] || mv -v $d $n +# done +# } +# ren_dir 1 +# ren_dir 2 +# # cp -a . $RPM_BUILD_ROOT%{my_desktopdir}/%{name} popd # Link it into the Gnome help system (must be found by calling @@ -177,6 +210,7 @@ install -d html/manual echo PDF only > html/manual/%{name} fi +%suse_update_desktop_file $RPM_BUILD_ROOT%{my_desktopdir}/%{name}/.directory %files pdf %defattr(-, root, root) @@ -189,9 +223,18 @@ %{my_desktopdir} %dir %{_datadir}/susehelp %{gnome_dir} +%if %suse_version > 1020 %dir /usr/share/gnome %dir /usr/share/gnome/help +%else +%dir /opt/gnome +%dir /opt/gnome/share +%dir /opt/gnome/share/gnome +%dir /opt/gnome/share/gnome/help +%endif %changelog +* Wed Nov 07 2007 - ke@suse.de +- Correct X-DOC-Weight using better style-sheet support. * Mon Oct 29 2007 - bg@suse.de - Fixing support information. * Fri Sep 21 2007 - ke@suse.de ++++++ APPARMOR-admin_en-graphics.tar.bz2 ++++++ ++++++ APPARMOR-admin_en.pdf ++++++ (binary differes) ++++++ APPARMOR-admin_en.tar.bz2 ++++++ ++++++ opensuse-gnomequick_en-graphics.tar.bz2 ++++++ ++++++ opensuse-gnomequick_en.pdf ++++++ (binary differes) ++++++ opensuse-gnomequick_en.tar.bz2 ++++++ ++++++ opensuse-html_en-desktop.tar.bz2 ++++++ ++++++ opensuse-html_en-html.tar.bz2 ++++++ opensuse-manual_en/opensuse-html_en-html.tar.bz2 /mounts/work_src_done/NOARCH/opensuse-manual_en/opensuse-html_en-html.tar.bz2 differ: byte 11, line 1 ++++++ opensuse-kdequick_en-graphics.tar.bz2 ++++++ ++++++ opensuse-kdequick_en.pdf ++++++ (binary differes) ++++++ opensuse-kdequick_en.tar.bz2 ++++++ ++++++ opensuse-kdeuser_en-graphics.tar.bz2 ++++++ opensuse-manual_en/opensuse-kdeuser_en-graphics.tar.bz2 /mounts/work_src_done/NOARCH/opensuse-manual_en/opensuse-kdeuser_en-graphics.tar.bz2 differ: byte 11, line 1 ++++++ opensuse-kdeuser_en.pdf ++++++ (binary differes) ++++++ opensuse-kdeuser_en.tar.bz2 ++++++ ++++++ opensuse-reference_en-graphics.tar.bz2 ++++++ ++++ 2342 lines of diff (skipped) ++++++ opensuse-reference_en.pdf ++++++ (binary differes) ++++++ opensuse-reference_en.tar.bz2 ++++++ ++++++ opensuse-startup_en-graphics.tar.bz2 ++++++ ++++ 4433 lines of diff (skipped) ++++++ opensuse-startup_en.pdf ++++++ (binary differes) ++++++ opensuse-startup_en.tar.bz2 ++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org