Hello community, here is the log from the commit of package opensuse-manuals_ru for openSUSE:Factory checked in at 2012-11-02 17:39:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-05-26 09:28:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.opensuse-manuals_ru.new/opensuse-manuals_ru.changes 2012-11-02 17:39:26.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Oct 31 10:08:26 UTC 2012 - pastakhov@yandex.ru + +- Corrected spec file + +------------------------------------------------------------------- New: ---- docbook.xsl ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opensuse-manuals_ru.spec ++++++ --- /var/tmp/diff_new_pack.QlLXhd/_old 2012-11-02 17:39:27.000000000 +0100 +++ /var/tmp/diff_new_pack.QlLXhd/_new 2012-11-02 17:39:27.000000000 +0100 @@ -16,6 +16,7 @@ # +%bcond_without PDF Name: opensuse-manuals_ru %define my_lang ru Version: 12.1.9028 @@ -30,12 +31,15 @@ #SOURCES Source901: doc_pre_checkin.sh Source903: attributes +Source999: docbook.xsl BuildRequires: daps +BuildRequires: fdupes 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: update-desktop-files BuildRequires: xerces-j2 %if 0%{?suse_version} >= 1140 BuildRequires: xmlgraphics-fop @@ -44,7 +48,6 @@ %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch - Summary: Complete set of openSUSE Manuals (HTML, Russian) License: GFDL-1.2 Group: Documentation/SUSE @@ -72,6 +75,7 @@ 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 @@ -129,26 +133,42 @@ %prep %setup -#%%setup -c -n %{name}-%{version}/opensuse-html +#%setup -c -n %{name}-%{version}/opensuse-html #PREP -#%%setup -c -T -D -n %{name}-%{version} +#%setup -c -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 +#%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/*) +# 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 +# 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) +sed -i " +s|@PATH@|file://%{_docdir}/%{name}| +s|^\(Name.*=.*\)|\1 (%{my_lang})| +" $document_files_dir/index.html.document mkdir yelp desktop sed " # remove useless comments and search settings /^Comment/d /^X-DOC-Search/d /^Categories=/d +/^DocPath=/d /^Name *=/i\ -DocPath=file://%{_defaultdocdir}/%{name}/manual/index.html\n\ +DocPath=file://%{_defaultdocdir}/%{name}/index.html\n\ +# for KDE:\n\ +X-DocPath=file://%{_docdir}/%{name}/index.html\n\ DocType=text/html\n\ DocLang=%{my_lang}\n\ Icon=document2\n\ @@ -165,11 +185,21 @@ export XEP_LICENSE=/etc/xep/license.xml export XEP_HOME=/usr/share/xep # export FOP=fop +export FOP_STACK="-Xss2048K" build_pdf () { - daps --envfile DC-${1} pdf-color - pdfname=$(daps --envfile DC-${1} pdf-color-name | sed /^Hint.*/d) +%if %{with PDF} + 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 + fi + pdfname=$(daps -d DC-${1} pdf-color-name | sed /^Hint.*/d) echo "$pdfname" > ${1}_ru-pdf.filelist - daps --envfile DC-${1} document-files-pdf + daps -d DC-${1} document-files-pdf sed " # remove useless comments and search settings /^Categories=/d @@ -177,116 +207,105 @@ /^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 \ +" $(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 +%else +: say build --with PDF +%endif } 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
%install #cd %{my_all_dir} -mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir} +mkdir -p %{buildroot}%{_defaultdocdir} # product is name without language code %define gnome_dir %{_datadir}/gnome/help/opensuse-manuals -install -d $RPM_BUILD_ROOT%{gnome_dir} +install -d %{buildroot}%{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 + %{buildroot}/%{_defaultdocdir}/%{name} +mkdir -p %{buildroot}/%{_datadir}/kde4/apps/khelpcenter/plugins cp desktop/%{name}.desktop \ - $RPM_BUILD_ROOT/%{_datadir}/kde4/apps/khelpcenter/plugins -cp yelp/%{name}.document $RPM_BUILD_ROOT/%{_datadir}/help + %{buildroot}/%{_datadir}/kde4/apps/khelpcenter/plugins +%suse_update_desktop_file '%{name}' +if [ %{my_lang} = en ]; then + yelp_document_dir=%{_datadir}/help + gnome_help_dir=%{_datadir}/help/C/gnome-help + { + echo "%dir $yelp_document_dir" + echo "%dir $gnome_help_dir" + } > %name.filelist +else + yelp_document_dir=%{_datadir}/help/LOCALE/%{my_lang} + 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 $gnome_help_dir" + } > %name.filelist +fi +mkdir -p %{buildroot}$yelp_document_dir +cp yelp/%{name}.document %{buildroot}$yelp_document_dir +mkdir -p %{buildroot}$gnome_help_dir +cp %name.page %{buildroot}$gnome_help_dir/%name.page +{ + echo "$yelp_document_dir/%{name}.document" + echo "$gnome_help_dir/%name.page" +} >> %name.filelist +%if %{with PDF} for f in *-pdf.filelist; do - mkdir $RPM_BUILD_ROOT/%{_defaultdocdir}/${f%\.filelist} + mkdir %{buildroot}/%{_defaultdocdir}/${f%\.filelist} cp -a --dereference $(head -n 1 $f) \ - $RPM_BUILD_ROOT/%{_defaultdocdir}/${f%\.filelist} + %{buildroot}/%{_defaultdocdir}/${f%\.filelist} sed -i 1d $f echo "%{_defaultdocdir}/${f%\.filelist}" >> $f cp $(head -n 1 $f) \ - $RPM_BUILD_ROOT/%{_datadir}/help + %{buildroot}/%{_datadir}/help sed -i 1d $f echo "%{_datadir}/help/${f%\.filelist}.document" >> $f done +%endif +%fdupes '%{buildroot}%{_docdir}' + +%if %{with PDF} #PDFINST -%clean -rm -fr ${RPM_BUILD_ROOT} +%endif #PDFXXX %files -n opensuse-startup_ru-pdf -f opensuse-startup_ru-pdf.filelist %defattr(-, root, root) -### %%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 -f opensuse-reference_ru-pdf.filelist %defattr(-, root, root) -### %%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 -f opensuse-security_ru-pdf.filelist %defattr(-, root, root) -### %%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 -f opensuse-kvm_ru-pdf.filelist %defattr(-, root, root) -### %%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 -f opensuse-tuning_ru-pdf.filelist %defattr(-, root, root) -### %%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 +%files -f %{name}.filelist %defattr(-, root, root) %dir %{_defaultdocdir} %{_defaultdocdir}/%{name} #GNOME -%dir %{_datadir}/help -%{_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 +%{_datadir}/kde4/apps/khelpcenter/plugins/%{name}.desktop %changelog ++++++ opensuse-manuals_ru-12.1.9028.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/opensuse-manuals_ru/opensuse-manuals_ru-12.1.9028.tar.bz2 /work/SRC/openSUSE:Factory/.opensuse-manuals_ru.new/opensuse-manuals_ru-12.1.9028.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org