Hello community, here is the log from the commit of package kicad-doc for openSUSE:Factory checked in at 2018-09-28 08:53:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kicad-doc (Old) and /work/SRC/openSUSE:Factory/.kicad-doc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kicad-doc" Fri Sep 28 08:53:45 2018 rev:15 rq:638705 version:5.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kicad-doc/kicad-doc.changes 2018-09-04 22:54:53.364738282 +0200 +++ /work/SRC/openSUSE:Factory/.kicad-doc.new/kicad-doc.changes 2018-09-28 08:54:05.845668847 +0200 @@ -1,0 +2,19 @@ +Sun Aug 5 00:24:13 UTC 2018 - stefan.bruens@rwth-aachen.de + +- Cleanup spec file: + * Remove unused BuildRequires: git + * Reduce BuildRequires:, use only required TeX packages instead of + the collection metapackages + * Remove commented out commands + * Drop default %defattr + * Use %_docdir instead of %_datadir +- Make build reproducible: + * Fix randomly selected Warning symbol image + * Force SOURCE_DATE_EPOCH usage in TeX +- Disable PDF generation on old distributions only, which + fail to build due to a XeTeX bug +- Fix zh subpackage: + * set correct language in locale(kicad-doc:zh) Provides + * include in fdupes run + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kicad-doc.spec ++++++ --- /var/tmp/diff_new_pack.qowjmO/_old 2018-09-28 08:54:07.253666825 +0200 +++ /var/tmp/diff_new_pack.qowjmO/_new 2018-09-28 08:54:07.253666825 +0200 @@ -12,25 +12,22 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -# No texlive-collection-langjapanese in 42.1 or 13.2 -%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200 -%bcond_without japanese +# Stock distribution package for xetex has a bug. As there is no way to just +# build languages which use pdftex, disable PDF documentation completely +%if 0%{?suse_version} > 1500 +%bcond_without pdf %else -%bcond_with japanese -%endif -%bcond_without italian -#eeschema_pdf_en fails to build in obs but builds local. %bcond_with pdf +%endif Name: kicad-doc Version: 5.0.0 Release: 0 Summary: Documentation and tutorials for KiCad -#-or-later License: GPL-3.0-or-later AND CC-BY-SA-3.0 Group: Documentation/Other Url: http://kicad-pcb.org @@ -43,29 +40,39 @@ BuildRequires: dblatex >= 0.3.4 BuildRequires: fdupes BuildRequires: gettext >= 0.18 -BuildRequires: git BuildRequires: libxslt-tools BuildRequires: po4a >= 0.45 BuildRequires: source-highlight +BuildRequires: perl(Unicode::LineBreak) %if %{with pdf} -BuildRequires: texlive-collection-langeuropean -BuildRequires: texlive-collection-langfrench -BuildRequires: texlive-collection-langgerman -BuildRequires: texlive-collection-langitalian -%if %{with japanese} -BuildRequires: texlive-collection-langjapanese +BuildRequires: texlive-babel-catalan +BuildRequires: texlive-babel-dutch +BuildRequires: texlive-babel-french +BuildRequires: texlive-babel-german +BuildRequires: texlive-babel-italian +BuildRequires: texlive-babel-polish +BuildRequires: texlive-babel-russian +BuildRequires: texlive-babel-spanish +BuildRequires: texlive-fandol +BuildRequires: texlive-gnu-freefont +BuildRequires: texlive-xetex BuildRequires: vlgothic-fonts +BuildRequires: tex(8r.enc) +BuildRequires: tex(bahasa.ldf) +BuildRequires: tex(cmap.sty) +BuildRequires: tex(eu1enc.def) +BuildRequires: tex(fancybox.sty) +BuildRequires: tex(japanese.ldf) +BuildRequires: tex(mathptmx.sty) +BuildRequires: tex(mathrsfs.sty) +BuildRequires: tex(pcrr8t.tfm) +BuildRequires: tex(phvb8t.tfm) +BuildRequires: tex(psyr.tfm) +BuildRequires: tex(ptmr8t.tfm) +BuildRequires: tex(pzdr.tfm) +BuildRequires: tex(xeCJK.sty) +BuildRequires: tex(xltxtra.sty) %endif -BuildRequires: texlive-collection-langcyrillic -BuildRequires: texlive-collection-langpolish -BuildRequires: texlive-collection-langspanish -BuildRequires: texlive-collection-latexrecommended -BuildRequires: texlive-collection-xetex -BuildRequires: texlive-euenc -BuildRequires: texlive-gnu-freefont-fonts -BuildRequires: texlive-xetexref -%endif -BuildRequires: perl(Unicode::LineBreak) BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: kicad = %{version} @@ -94,7 +101,6 @@ %description fr This package contains French documentation and tutorials for KiCad -%if %{with italian} %package it Summary: Italian documentation and tutorials for KiCad Group: Documentation/Other @@ -103,9 +109,7 @@ %description it This package contains Italian documentation and tutorials for KiCad -%endif -%if %{with japanese} %package ja Summary: Japanese documentation and tutorials for KiCad Group: Documentation/Other @@ -114,7 +118,6 @@ %description ja This package contains Japanese documentation and tutorials for KiCad -%endif %package nl Summary: Netherlandian documentation and tutorials for KiCad @@ -182,7 +185,7 @@ %package zh Summary: Chinese documentation and tutorials for KiCad Group: Documentation/Other -Provides: locale(kicad-doc:id) +Provides: locale(kicad-doc:zh) Requires: kicad-doc = %{version} %description zh @@ -191,127 +194,73 @@ %prep %setup -q -# Fix documentation path -sed -i "s|share/doc/kicad|share/doc/packages/kicad|" CMakeModules/KiCadDocumentation.cmake %patch0 %patch1 -# FIXME -%if %{without japanese} -# Delete japanese translation due to build problems -find src/ -name 'addendum.ja' -type f -delete -print -find src/ -name 'ja.po' -type f -delete -print -%endif -#Problems with italian too -%if %{without italian} -find src/ -name 'addendum.it' -type f -delete -print -find src/ -name 'it.po' -type f -delete -print -%endif +# Workaround for dblatex bug #117 - randomly selected warning symbol +cp /usr/share/dblatex/latex/graphics/warning.pdf CMakeSupport/ %build +# SOURCE_DATE_EPOCH affirmation variable used by TeX, current +export FORCE_SOURCE_DATE=1 +# Deprecated variant used by TeX in Leap 42.x +export SOURCE_DATE_EPOCH_TEX_PRIMITIVES=1 +# Supported output formats: html;pdf;epub; %if %{with pdf} -%cmake +%cmake -DKICAD_DOC_PATH=%{_docdir}/kicad/help -DBUILD_FORMATS='html;pdf;' %else -%cmake -DBUILD_FORMATS:STRING=html -%endif - -make all %{?_smp_mflags} -#make cvpcb -#make gerbview -#make getting_started_in_kicad -#make idf_exporter -#make kicad -#make pcbnew -#make plugins -#make pl_editor -#make gui_translation_howto -%if 1 == 0 -make eeschema_pdf_ru -make eeschema_pdf_fr -make eeschema_pdf_es -make eeschema_pdf_de -make eeschema_pdf_pl -make eeschema_pdf_en +%cmake -DKICAD_DOC_PATH=%{_docdir}/kicad/help -DBUILD_FORMATS='html;' %endif +%{make_jobs} %install %cmake_install -%fdupes -s %{buildroot}%{_datadir}/doc/packages/kicad/help/en -%fdupes -s %{buildroot}%{_datadir}/doc/packages/kicad/help/fr -%fdupes -s %{buildroot}%{_datadir}/doc/packages/kicad/help/nl -%fdupes -s %{buildroot}%{_datadir}/doc/packages/kicad/help/pl -%fdupes -s %{buildroot}%{_datadir}/doc/packages/kicad/help/ca -%fdupes -s %{buildroot}%{_datadir}/doc/packages/kicad/help/de -%fdupes -s %{buildroot}%{_datadir}/doc/packages/kicad/help/es -%fdupes -s %{buildroot}%{_datadir}/doc/packages/kicad/help/ru -%fdupes -s %{buildroot}%{_datadir}/doc/packages/kicad/help/id -%if %{with italian} -%fdupes -s %{buildroot}%{_datadir}/doc/packages/kicad/help/it -%endif -%if %{with japanese} -%fdupes -s %{buildroot}%{_datadir}/doc/packages/kicad/help/ja -%endif +for lang in ca de en es fr id it ja nl pl ru zh ; do + %fdupes %{buildroot}%{_docdir}/kicad/help/$lang +done %files -%defattr(-,root,root) -%dir %{_datadir}/doc/packages/kicad/ -%dir %{_datadir}/doc/packages/kicad/help/ +%dir %{_docdir}/kicad/ +%dir %{_docdir}/kicad/help/ %doc AUTHORS_README.adoc CHEATSHEET.adoc README.adoc %license LICENSE.adoc %files en -%defattr(-,root,root) -%{_datadir}/doc/packages/kicad/help/en/ +%{_docdir}/kicad/help/en/ %files fr %defattr(-,root,root) -%{_datadir}/doc/packages/kicad/help/fr/ +%{_docdir}/kicad/help/fr/ -%if %{with italian} %files it -%defattr(-,root,root) -%{_datadir}/doc/packages/kicad/help/it/ -%endif +%{_docdir}/kicad/help/it/ -%if %{with japanese} %files ja -%defattr(-,root,root) -%{_datadir}/doc/packages/kicad/help/ja/ -%endif +%{_docdir}/kicad/help/ja/ %files nl -%defattr(-,root,root) -%{_datadir}/doc/packages/kicad/help/nl/ +%{_docdir}/kicad/help/nl/ %files pl -%defattr(-,root,root) -%{_datadir}/doc/packages/kicad/help/pl/ +%{_docdir}/kicad/help/pl/ %files ca -%defattr(-,root,root) -%{_datadir}/doc/packages/kicad/help/ca/ +%{_docdir}/kicad/help/ca/ %files de -%defattr(-,root,root) -%{_datadir}/doc/packages/kicad/help/de/ +%{_docdir}/kicad/help/de/ %files es -%defattr(-,root,root) -%{_datadir}/doc/packages/kicad/help/es/ +%{_docdir}/kicad/help/es/ %files ru -%defattr(-,root,root) -%{_datadir}/doc/packages/kicad/help/ru/ +%{_docdir}/kicad/help/ru/ %files id -%defattr(-,root,root) -%{_datadir}/doc/packages/kicad/help/id/ +%{_docdir}/kicad/help/id/ %files zh -%defattr(-,root,root) -%{_datadir}/doc/packages/kicad/help/zh/ - -# There's clearly a changelog tag +%{_docdir}/kicad/help/zh/ %changelog