Dominique Leuenberger 2022-01-07 11:45:28 +00:00 committed by Git OBS Bridge
commit 5d9e499e23
5 changed files with 25 additions and 13 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e30ad2d31fc305e8c1de313600dabd34a91176122909085c45e08c31133e6643
size 74217615

3
kicad-doc-6.0.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d0f04c8febf9d7b723a4ff747a104d527fa8edfb4d7da1abdadf023ec08e2ed2
size 79514250

View File

@ -2,14 +2,13 @@ Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt.orig 2017-04-13 10:18:48.656747496 +0200
+++ CMakeLists.txt 2017-04-13 13:10:55.648428778 +0200
@@ -31,8 +31,10 @@ include( AsciidocHelpers )
@@ -31,6 +31,9 @@ include( AsciidocHelpers )
# Add the common asciidoc options
add_adoc_option( -b html5 )
add_adoc_option( -a toc2 )
+add_adoc_option( -a footer-style=none )
add_adoc_option( --section-numbers )
add_adoc_option( --theme flask )
+add_adoc_option( --verbose )
# Add the common a2x options
add_a2x_option( --xsltproc-opts=--nonet )
+add_a2x_option( --verbose )
add_adoc_option( --section-numbers )
if( NOT "${ADOC_TOOLCHAIN}" MATCHES "ASCIIDOCTOR" )
# --theme parameter not supported by asciidoctor

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Dec 25 16:56:09 UTC 2021 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Update to version 6.0.0
See https://www.kicad.org/blog/2021/12/KiCad-6.0.0-Release/ for details.
-------------------------------------------------------------------
Thu Nov 18 03:32:50 UTC 2021 - Stefan Brüns <stefan.bruens@rwth-aachen.de>

View File

@ -33,7 +33,7 @@ ExclusiveArch: do_not_build
%endif
Name: kicad-doc%{?pkg_suffix}
Version: 5.1.12
Version: 6.0.0
Release: 0
Summary: Documentation and tutorials for KiCad
License: CC-BY-SA-3.0 AND GPL-3.0-or-later
@ -77,6 +77,7 @@ BuildRequires: tex(phvb8t.tfm)
BuildRequires: tex(psyr.tfm)
BuildRequires: tex(ptmr8t.tfm)
BuildRequires: tex(pzdr.tfm)
BuildRequires: tex(upquote.sty)
BuildRequires: tex(xeCJK.sty)
BuildRequires: tex(xltxtra.sty)
# kicad-doc owns the directories
@ -196,6 +197,11 @@ This package contains Chinese documentation and tutorials for KiCad
%patch0
# These files are actually GIFs, https://gitlab.com/kicad/services/kicad-doc/-/issues/822
mv src/gerbview/images/zh/gerbview_x2_attribute.{png,gif}
mv src/gerbview/images/zh/gerbview_x2_component.{png,gif}
mv src/gerbview/images/zh/gerbview_x2_net.{png,gif}
%if %{with pdf}
# Workaround for dblatex bug #117 - randomly selected warning symbol
cp /usr/share/dblatex/latex/graphics/warning.pdf CMakeSupport/
@ -207,9 +213,10 @@ cp /usr/share/dblatex/latex/graphics/warning.pdf CMakeSupport/
# SOURCE_DATE_EPOCH affirmation variable used by TeX
export FORCE_SOURCE_DATE=1
# Do not build PL translations, bad interaction of po4a, asciidoc and xetex (gh#KiCad/kicad-doc#697)
%cmake -DKICAD_DOC_PATH=%{_docdir}/kicad/help -DBUILD_FORMATS='pdf;' -DLANGUAGES='ca;de;en;es;fr;id;it;ja;ru;zh'
# RU also fails, "Undefined control sequence \cyrchar."
%cmake -DKICAD_DOC_PATH=%{_docdir}/kicad/help -DADOC_TOOLCHAIN=asciidoc -DPDF_GENERATOR=dblatex -DBUILD_FORMATS='pdf;' -DLANGUAGES='ca;de;en;es;fr;id;it;ja;zh'
%else
%cmake -DKICAD_DOC_PATH=%{_docdir}/kicad/help -DBUILD_FORMATS='html;'
%cmake -DKICAD_DOC_PATH=%{_docdir}/kicad/help -DADOC_TOOLCHAIN=asciidoc -DBUILD_FORMATS='html;'
%endif
%{make_jobs}
@ -255,10 +262,10 @@ done
%if %{without pdf}
%files pl
%{_docdir}/kicad/help/pl/
%endif
%files ru
%{_docdir}/kicad/help/ru/
%endif
%files zh
%{_docdir}/kicad/help/zh/