commit opensuse-manuals_ru for openSUSE:Factory
Hello community, here is the log from the commit of package opensuse-manuals_ru for openSUSE:Factory checked in at 2012-05-08 06:47:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-02-14 13:07:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.opensuse-manuals_ru.new/opensuse-manuals_ru.changes 2012-05-08 06:47:16.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 23 15:03:52 UTC 2012 - egdfree@opensuse.org + +- Manuals translate update for 12.1 (bnc#758401) + +------------------------------------------------------------------- Old: ---- opensuse-html_ru-desktop.tar.bz2 opensuse-html_ru-graphics.tar.bz2 opensuse-html_ru-html.tar.bz2 opensuse-html_ru.tar.bz2 opensuse-kvm_ru-pdf-yelp.tar.bz2 opensuse-kvm_ru.pdf opensuse-reference_ru-pdf-yelp.tar.bz2 opensuse-reference_ru.pdf opensuse-security_ru-pdf-yelp.tar.bz2 opensuse-security_ru.pdf opensuse-startup_ru-pdf-yelp.tar.bz2 opensuse-startup_ru.pdf opensuse-tuning_ru-pdf-yelp.tar.bz2 opensuse-tuning_ru.pdf New: ---- opensuse-manuals_ru-12.1.8762.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opensuse-manuals_ru.spec ++++++ --- /var/tmp/diff_new_pack.NaR06b/_old 2012-05-08 06:47:19.000000000 +0200 +++ /var/tmp/diff_new_pack.NaR06b/_new 2012-05-08 06:47:19.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package opensuse-manuals_ru # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,52 +15,43 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: opensuse-manuals_ru %define my_lang ru -%define my_book opensuse-html -Version: 11.4 +Version: 12.1.8762 Release: 0 +#BREQ +Provides: apparmor-admin_ru = %{version} Provides: locale(desktop-data-openSUSE:ru) -Obsoletes: opensuse-manual_ru < 11.2 opensuse-kdequick_ru < 11.1 opensuse-gnomequick_ru < 11.1 opensuse-gnomeuser_ru < 11.1 opensuse-kdeuser_ru < 11. opensuse-kde3user_ru < 11.1 apparmor-admin_ru < 11.1 -Provides: opensuse-manual_ru = %{version}-%{release} opensuse-kdequick_ru = %{version}-%{release} opensuse-gnomequick_ru = %{version}-%{release} opensuse-gnomeuser_ru = %{version}-%{release} opensuse-kdeuser_ru = %{version}-%{release} opensuse-kde3user_ru = %{version}-%{release} apparmor-admin_ru = %{version}-%{release} -Obsoletes: opensuse-manual_ru-pdf < 11.2 opensuse-kde3user_ru-pdf < 11.1 opensuse-manuals_ru-pdf < 11.3 opensuse-apparmor-admin_ru-pdf < 11.3 -Provides: opensuse-manual_ru-pdf = %{version}-%{release} opensuse-kde3user_ru-pdf = %{version}-%{release} opensuse-manuals_ru-pdf = %{version}-%{release} opensuse-apparmor-admin_ru-pdf = %{version}-%{release} #OBS -Source00: opensuse-html_ru-html.tar.bz2 -Source01: opensuse-html_ru-desktop.tar.bz2 -Source02: opensuse-html_ru-graphics.tar.bz2 -Source03: opensuse-html_ru.tar.bz2 -Source10: opensuse-startup_ru.pdf -#Source11: opensuse-startup_ru-graphics.tar.bz2 -#Source12: opensuse-startup_ru.tar.bz2 -Source13: opensuse-startup_ru-pdf-yelp.tar.bz2 -Source20: opensuse-reference_ru.pdf -#Source21: opensuse-reference_ru-graphics.tar.bz2 -#Source22: opensuse-reference_ru.tar.bz2 -Source23: opensuse-reference_ru-pdf-yelp.tar.bz2 -Source30: opensuse-security_ru.pdf -#Source31: opensuse-security_ru-graphics.tar.bz2 -#Source32: opensuse-security_ru.tar.bz2 -Source33: opensuse-security_ru-pdf-yelp.tar.bz2 -Source40: opensuse-kvm_ru.pdf -#Source41: opensuse-kvm_ru-graphics.tar.bz2 -#Source42: opensuse-kvm_ru.tar.bz2 -Source43: opensuse-kvm_ru-pdf-yelp.tar.bz2 -Source50: opensuse-tuning_ru.pdf -#Source51: opensuse-tuning_ru-graphics.tar.bz2 -#Source52: opensuse-tuning_ru.tar.bz2 -Source53: opensuse-tuning_ru-pdf-yelp.tar.bz2 +Source: %{name}-%{version}.tar.bz2 +#Source01: opensuse-html_ru-graphics.tar.bz2 #SOURCES Source901: doc_pre_checkin.sh Source903: attributes +BuildRequires: daps +BuildRequires: suse-xsl-stylesheets +# Also buildrequire tools that susedoc does not pull in automatically ATM +BuildRequires: poppler-tools +BuildRequires: python-lxml +BuildRequires: python-xml +BuildRequires: xerces-j2 +%if 0%{?suse_version} >= 1140 +BuildRequires: xmlgraphics-fop +%else +BuildRequires: fop +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch + Summary: Complete set of openSUSE Manuals (HTML, Russian) License: GFDL-1.2 Group: Documentation/SUSE %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. @@ -78,8 +69,8 @@ %package -n opensuse-startup_ru-pdf Summary: openSUSE manual: Start-Up (PDF, Russian) +Group: Documentation/SUSE #Provides: locale(desktop-data-openSUSE:ru) -###PDFOBS %description -n opensuse-startup_ru-pdf Guides you through the installation and basic configuration of your @@ -90,6 +81,7 @@ %package -n opensuse-reference_ru-pdf Summary: openSUSE manual: Reference (PDF, Russian) +Group: Documentation/SUSE #Provides: locale(desktop-data-openSUSE:ru) ###PDFOBS @@ -104,6 +96,7 @@ %package -n opensuse-security_ru-pdf Summary: openSUSE manual: Security Guide (PDF, Russian) +Group: Documentation/SUSE #Provides: locale(desktop-data-openSUSE:ru) ###PDFOBS @@ -117,6 +110,7 @@ %package -n opensuse-kvm_ru-pdf Summary: openSUSE manual: KVM Guide (PDF, Russian) +Group: Documentation/SUSE #Provides: locale(desktop-data-openSUSE:ru) ###PDFOBS @@ -125,6 +119,7 @@ %package -n opensuse-tuning_ru-pdf Summary: openSUSE manual: Tuning Guide (PDF, Russian) +Group: Documentation/SUSE #Provides: locale(desktop-data-openSUSE:ru) ###PDFOBS @@ -132,197 +127,88 @@ This guide introduces basic concepts of system tuning. %prep -#%setup -c -q -%setup -c -q -a 01 -#echo "This PDF package is empty. Find the PDFs in sub-packages." >README-pdf +%setup +#%setup -c -n %{name}-%{version}/opensuse-html #PREP +#%setup -c -T -D -n %{name}-%{version} find -name '*.png' -o -name '*.svg' | xargs chmod 644 || : -tar xvf %{S:13} -tar xvf %{S:23} -tar xvf %{S:33} -tar xvf %{S:43} -tar xvf %{S:53} #PDFPREP %build -# 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 -mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir} -# is set for sles or sled as /sles or /sled -# mkdir -p desktop/{startup,reference,application,apparmor-admin-guide} -### -# product is name without language code -%define gnome_dir %{_datadir}/gnome/help/opensuse-manuals -install -d $RPM_BUILD_ROOT%{gnome_dir} -# -if [ -d html/%my_book ]; then -mv html/%my_book html/manual -### handle desktop files -pushd desktop -# problem writing desktop files on 10.3 -### CHECKIT: still necessary on 11.0? -if [ -d index.desktop ]; then - for f in $(find index.desktop -mindepth 1 -maxdepth 1); do - mv $f . - done - rmdir index.desktop -fi -### CHECKIT: can we fix this for 11.0? Just avoid the subdir... -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 d in $(find . -maxdepth 1 -type d -name 'book*'); do - id=${d//\./} - id=${id//\//}%{my_lang} - pushd $d - for f in $(find . -name '.directory'); do - sed -i "s|@PATH@|%{_defaultdocdir}/%{name}/manual| -s/\[\]// -s|@id@|$id|" $f - case $d in - *_startup) - [ $f = "./.directory" ] \ - && sed -i "s|^\(X-DOC-Weight\).*|\1=-10000|" $f ;; - esac - done - popd -done -### remove it, only keep yelp and kde4 -- they depend on top-level -### .directory files... -# Probably useful for stand-alone books -for f in $(find . -name '*.directory'); do - id=%{name} - id=${id//_/} - sed -i "s|@PATH@|%{_defaultdocdir}/%{name}/manual| -s/\[\]// -s|@id@|$id|" $f - # Fix the index.html reference - if [ $f = ./.directory ]; then - sed -i 's:\(^DocPath.*/\).*:\1index.html: -s/^\(Name\|Comment\)\(.*\)/\1\2 (%{my_lang})/' $f - - # write yelp / rarian file - sed " +#%define my_all_dir %{_builddir}/%{name}-%{version}/opensuse-html +#cd %{my_all_dir} +daps -d DC-opensuse-html html --static +echo "$(daps -d DC-opensuse-html html-dir-name)" > %{name}.filelist +daps -d DC-opensuse-html document-files-html +mkdir yelp desktop +sed " # remove useless comments and search settings /^Comment/d /^X-DOC-Search/d -s/^\[Desktop Entry\]/[Document]/ +/^Categories=/d /^Name *=/i\ DocPath=file://%{_defaultdocdir}/%{name}/manual/index.html\n\ DocType=text/html\n\ DocLang=%{my_lang}\n\ Icon=document2\n\ Categories=System;Core;Translation;Documentation -s/^X-DOC-Identifier=/DocIdentifier=com.novell./ +s/^X-DOC-Identifier=/DocIdentifier=com.suse./ s/^X-DOC-Weight/DocWeight/ -" $f > ../%{name}.document -# %{summary} is unreliable -# my_title=$(echo "%{summary}" \ -# | sed 's/\(as \)*[Pp][Dd][Ff]//;s/ *(.*)//') -# #if grep -s -q '^Name *= *$' ../%{name}.document; then -# sed -i " -# s/^\(Name.*\)=\(.*\)/\1=$my_title \2/" ../%{name}.document - # fi - # if Name contains just "Documentation", add product info - # FIXME: check this properly - if ! grep -s -q '^Name *= *openSUSE' ../%{name}.document; then - sed -i " -s/^\(Name.*\)=\(.*\)/\1=openSUSE \2/" ../%{name}.document - fi - fi - # make sure to sort sles-startup guide first - case %name in - sles-startup*) - [ $f = "./.directory" ] \ - && sed -i "s|^\(X-DOC-Weight\).*|\1=-2000|" $f ;; - esac -done -popd -if [ -d yelp ]; then - pushd yelp - for f in *.document; do - dir=${f%.document} - pdf_file=${dir/-pdf/.pdf} - dir=$(echo $dir | tr [:upper:] [:lower:]) - sed -i "s|^\(DocPath=\).*|\1/usr/share/doc/manual/$dir/$pdf_file| -s|^Categories=.*|Categories=System;Core;Translation;Documentation| -s|^\(Name.*\)|\1 (PDF)|" $f - done - popd -fi -if [ %{my_lang} = "en" ]; then - mkdir -p $RPM_BUILD_ROOT%{_datadir}/help - for f in yelp/*.document; do - file=$(echo $f | tr [:upper:] [:lower:]) - cp $f $RPM_BUILD_ROOT%{_datadir}/help/${file#*/} - done - sed "s/Documentation *\(Documentation\)/\1/" %{name}.document \ - > $RPM_BUILD_ROOT%{_datadir}/help/%{name}.document - # KDE4 - %define kdedir %{_datadir}/kde4/apps/khelpcenter/plugins - mkdir -p $RPM_BUILD_ROOT/%kdedir - pushd $RPM_BUILD_ROOT%{_datadir}/help - for doc in *.document; do - sed "\ -s/\[Document\]/[Desktop Entry]/ -" $doc >$RPM_BUILD_ROOT/%kdedir/${doc%\.document}.desktop - done - popd -else - mkdir -p $RPM_BUILD_ROOT%{_datadir}/help/LOCALE/%{my_lang} - for f in yelp/*.document; do - file=$(echo $f | tr [:upper:] [:lower:]) - cp $f $RPM_BUILD_ROOT%{_datadir}/help/LOCALE/%{my_lang}/${file#*/} - done - sed "s/Documentation *\(Documentation\)/\1/" %{name}.document \ - > $RPM_BUILD_ROOT%{_datadir}/help/LOCALE/%{my_lang}/%{name}.document -fi -# old stuff -# Link it into the Gnome help system (must be found by calling -# susehelp help://suselinux-manual/ -pushd $RPM_BUILD_ROOT%{gnome_dir} -if [ %{my_lang} = "en" ]; then - target=$RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/manual - install -d $target - ln -sf %{_defaultdocdir}/%{name}/manual C -else - target=$RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/manual - install -d $target - ln -sf %{_defaultdocdir}/%{name}/manual %{my_lang} -fi -popd -else -# PDF only books -install -d html/manual -echo PDF only > html/manual/%{name} -fi -cp %{S:10} . -mkdir opensuse-startup - -cp %{S:20} . -mkdir opensuse-reference - -cp %{S:30} . -mkdir opensuse-security - -cp %{S:40} . -mkdir opensuse-kvm +" $(daps -d DC-opensuse-html document-files-dir-name | sed /^Hint.*/d)/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 + +#MAKE_DOC +export XEP_LICENSE=/etc/xep/license.xml +export XEP_HOME=/usr/share/xep +# export FOP=fop +build_pdf () { + daps --envfile DC-${1} pdf-color + pdfname=$(daps --envfile DC-${1} pdf-color-name | sed /^Hint.*/d) + echo "$pdfname" > ${1}_ru-pdf.filelist + daps --envfile DC-${1} document-files-pdf + sed " +# 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 --envfile 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 +} +all_pdf_docs=" opensuse-startup opensuse-reference opensuse-security opensuse-kvm opensuse-tuning" +[ -n "$all_pdf_docs" ] && for b in $all_pdf_docs; do build_pdf $b; done -cp %{S:50} . -mkdir opensuse-tuning +%install +#cd %{my_all_dir} +mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir} +# product is name without language code +%define gnome_dir %{_datadir}/gnome/help/opensuse-manuals +install -d $RPM_BUILD_ROOT%{gnome_dir} +# +cp -a --dereference $(head -n 1 %{name}.filelist) \ + $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name} +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/kde4/apps/khelpcenter/plugins +mkdir $RPM_BUILD_ROOT/%{_datadir}/help +cp desktop/%{name}.desktop \ + $RPM_BUILD_ROOT/%{_datadir}/kde4/apps/khelpcenter/plugins +cp yelp/%{name}.document $RPM_BUILD_ROOT/%{_datadir}/help + +for f in *-pdf.filelist; do + mkdir $RPM_BUILD_ROOT/%{_defaultdocdir}/${f%\.filelist} + cp -a --dereference $(head -n 1 $f) \ + $RPM_BUILD_ROOT/%{_defaultdocdir}/${f%\.filelist} + sed -i 1d $f + echo "%{_defaultdocdir}/${f%\.filelist}" >> $f + cp $(head -n 1 $f) \ + $RPM_BUILD_ROOT/%{_datadir}/help + sed -i 1d $f + echo "%{_datadir}/help/${f%\.filelist}.document" >> $f +done #PDFINST @@ -331,45 +217,75 @@ #PDFXXX -%files -n opensuse-startup_ru-pdf +%files -n opensuse-startup_ru-pdf -f opensuse-startup_ru-pdf.filelist %defattr(-, root, root) -%doc opensuse-startup_ru.pdf -%{_datadir}/help/LOCALE/ru/opensuse-startup_ru-pdf.document +### %%doc build/opensuse-startup/package/pdf/opensuse-startup_en.pdf +### %%{_datadir}/help/opensuse-startup_en-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_en-pdf.desktop +### -%files -n opensuse-reference_ru-pdf +%files -n opensuse-reference_ru-pdf -f opensuse-reference_ru-pdf.filelist %defattr(-, root, root) -%doc opensuse-reference_ru.pdf -%{_datadir}/help/LOCALE/ru/opensuse-reference_ru-pdf.document +### %%doc build/opensuse-reference/package/pdf/opensuse-reference_en.pdf +### %%{_datadir}/help/opensuse-reference_en-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_en-pdf.desktop +### -%files -n opensuse-security_ru-pdf +%files -n opensuse-security_ru-pdf -f opensuse-security_ru-pdf.filelist %defattr(-, root, root) -%doc opensuse-security_ru.pdf -%{_datadir}/help/LOCALE/ru/opensuse-security_ru-pdf.document +### %%doc build/opensuse-security/package/pdf/opensuse-security_en.pdf +### %%{_datadir}/help/opensuse-security_en-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_en-pdf.desktop +### -%files -n opensuse-kvm_ru-pdf +%files -n opensuse-kvm_ru-pdf -f opensuse-kvm_ru-pdf.filelist %defattr(-, root, root) -%doc opensuse-kvm_ru.pdf -%{_datadir}/help/LOCALE/ru/opensuse-kvm_ru-pdf.document +### %%doc build/opensuse-kvm/package/pdf/opensuse-kvm_en.pdf +### %%{_datadir}/help/opensuse-kvm_en-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_en-pdf.desktop +### -%files -n opensuse-tuning_ru-pdf +%files -n opensuse-tuning_ru-pdf -f opensuse-tuning_ru-pdf.filelist %defattr(-, root, root) -%doc opensuse-tuning_ru.pdf -%{_datadir}/help/LOCALE/ru/opensuse-tuning_ru-pdf.document +### %%doc build/opensuse-tuning/package/pdf/opensuse-tuning_en.pdf +### %%{_datadir}/help/opensuse-tuning_en-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_en-pdf.desktop +### + #PDFFILES %files %defattr(-, root, root) %dir %{_defaultdocdir} -%doc html/manual -#GNOME -- probably obsolete now -%{gnome_dir} -%dir /usr/share/gnome -%dir /usr/share/gnome/help -#recent GNOME +%{_defaultdocdir}/%{name} +#GNOME %dir %{_datadir}/help -%dir %{_datadir}/help/LOCALE -%dir %{_datadir}/help/LOCALE/ru -%{_datadir}/help/LOCALE/ru/%{name}.document +%{_datadir}/help/%{name}.document #KDE4 +%dir %{_datadir}/kde4/apps/khelpcenter/plugins +%dir %{_datadir}/kde4/apps/khelpcenter +%dir %{_datadir}/kde4/apps +%dir %{_datadir}/kde4 +%{_datadir}/kde4/apps/khelpcenter/plugins/%%{name}.desktop %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de