diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..1792833 --- /dev/null +++ b/_multibuild @@ -0,0 +1,4 @@ + + pdf + html + diff --git a/kicad-doc-5.0.2.tar.gz b/kicad-doc-5.0.2.tar.gz deleted file mode 100644 index c0466dd..0000000 --- a/kicad-doc-5.0.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c343185cc09406611aff342be33659136d966ede30b44535b4687712ef1672de -size 68999325 diff --git a/kicad-doc-5.1.0.tar.gz b/kicad-doc-5.1.0.tar.gz new file mode 100644 index 0000000..b8a12a7 --- /dev/null +++ b/kicad-doc-5.1.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b49b0456f33e2a075157d6eb03dcdd72102b8329bf9d1c4a6c098b574f8817a +size 74965788 diff --git a/kicad-doc.changes b/kicad-doc.changes index e253de1..795aad4 100644 --- a/kicad-doc.changes +++ b/kicad-doc.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Mar 12 22:45:18 UTC 2019 - Stefan Brüns + +- Update to minor release 5.1.0 + * Various smaller changes and translation updates + * (Empty) nl translation package removed +- Build PDF and HTML documentation as _multibuild + * Remove dblatex BuildRequires for HTML build + ------------------------------------------------------------------- Thu Dec 6 09:56:38 UTC 2018 - davejplater@gmail.com diff --git a/kicad-doc.spec b/kicad-doc.spec index 68def68..2af1711 100644 --- a/kicad-doc.spec +++ b/kicad-doc.spec @@ -1,7 +1,7 @@ # -# spec file for package kicad-doc +# spec file for package kicad # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,31 +12,48 @@ # 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/ # +%global flavor @BUILD_FLAVOR@%{nil} +%define sname kicad-doc + +%if "%flavor" == "" +ExclusiveArch: do_not_build +%endif + +%if "%flavor" == "pdf" +%define pkg_suffix -pdf # 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 +ExclusiveArch: do_not_build +%endif +%endif + +%if "%flavor" == "html" %bcond_with pdf %endif -Name: kicad-doc -Version: 5.0.2 +Name: kicad-doc%{?pkg_suffix} +Version: 5.1.0 Release: 0 Summary: Documentation and tutorials for KiCad License: GPL-3.0-or-later AND CC-BY-SA-3.0 +%if "%flavor" == "pdf" Group: Documentation/Other +%else +Group: Documentation/HTML +%endif Url: http://kicad-pcb.org -Source: https://github.com/KiCad/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source: https://github.com/KiCad/%{sname}/archive/%{version}.tar.gz#/%{sname}-%{version}.tar.gz # PATCH-FIX-OPENSUSE kicad-doc-notimestamp.patch davejplater@gmail.com -- Remove time stamped footer from html pages. Patch0: kicad-doc-notimestamp.patch BuildRequires: asciidoc >= 8.6.9 BuildRequires: cmake -BuildRequires: dblatex >= 0.3.4 BuildRequires: fdupes BuildRequires: gettext >= 0.18 BuildRequires: libxslt-tools @@ -44,6 +61,7 @@ BuildRequires: po4a >= 0.45 BuildRequires: source-highlight BuildRequires: perl(Unicode::LineBreak) %if %{with pdf} +BuildRequires: dblatex >= 0.3.4 BuildRequires: texlive-babel-catalan BuildRequires: texlive-babel-dutch BuildRequires: texlive-babel-french @@ -71,10 +89,11 @@ BuildRequires: tex(ptmr8t.tfm) BuildRequires: tex(pzdr.tfm) BuildRequires: tex(xeCJK.sty) BuildRequires: tex(xltxtra.sty) +# kicad-doc owns the directories +BuildRequires: kicad-doc %endif BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: kicad = %{version} +Recommends: kicad = %{version} %description Kicad is an open source software for the creation of electronic @@ -85,28 +104,26 @@ and tutorials. %package ca Summary: Catalan documentation and tutorials for KiCad -Group: Documentation/Other Provides: locale(kicad-doc:ca) +Requires: %{name}-en = %{version} Requires: kicad-doc = %{version} -Requires: kicad-doc-en = %{version} %description ca This package contains Catalan documentation and tutorials for KiCad %package de Summary: German documentation and tutorials for KiCad -Group: Documentation/Other Provides: locale(kicad-doc:de) +Requires: %{name}-en = %{version} Requires: kicad-doc = %{version} -Requires: kicad-doc-en = %{version} %description de This package contains German documentation and tutorials for KiCad %package en Summary: English documentation and tutorials for KiCad -Group: Documentation/Other Provides: locale(kicad-doc:en) +Requires: kicad = %{version} Requires: kicad-doc = %{version} %description en @@ -114,110 +131,95 @@ This package contains English documentation and tutorials for KiCad %package es Summary: Spanish documentation and tutorials for KiCad -Group: Documentation/Other Provides: locale(kicad-doc:es) +Requires: %{name}-en = %{version} Requires: kicad-doc = %{version} -Requires: kicad-doc-en = %{version} %description es This package contains Spanish documentation and tutorials for KiCad %package fr Summary: French documentation and tutorials for KiCad -Group: Documentation/Other Provides: locale(kicad-doc:fr) +Requires: %{name}-en = %{version} Requires: kicad-doc = %{version} -Requires: kicad-doc-en = %{version} %description fr This package contains French documentation and tutorials for KiCad %package id Summary: Indonesian documentation and tutorials for KiCad -Group: Documentation/Other Provides: locale(kicad-doc:id) +Requires: %{name}-en = %{version} Requires: kicad-doc = %{version} -Requires: kicad-doc-en = %{version} %description id This package contains Indonesian documentation and tutorials for KiCad %package it Summary: Italian documentation and tutorials for KiCad -Group: Documentation/Other Provides: locale(kicad-doc:it) +Requires: %{name}-en = %{version} Requires: kicad-doc = %{version} -Requires: kicad-doc-en = %{version} %description it This package contains Italian documentation and tutorials for KiCad %package ja Summary: Japanese documentation and tutorials for KiCad -Group: Documentation/Other Provides: locale(kicad-doc:ja) +Requires: %{name}-en = %{version} Requires: kicad-doc = %{version} -Requires: kicad-doc-en = %{version} %description ja This package contains Japanese documentation and tutorials for KiCad -%package nl -Summary: Netherlandian documentation and tutorials for KiCad -Group: Documentation/Other -Provides: locale(kicad-doc:nl) -Requires: kicad-doc = %{version} -Requires: kicad-doc-en = %{version} - -%description nl -This package contains Netherlandian documentation and tutorials for KiCad - %package pl Summary: Polish documentation and tutorials for KiCad -Group: Documentation/Other Provides: locale(kicad-doc:pl) +Requires: %{name}-en = %{version} Requires: kicad-doc = %{version} -Requires: kicad-doc-en = %{version} %description pl This package contains Polish documentation and tutorials for KiCad %package ru Summary: Russian documentation and tutorials for KiCad -Group: Documentation/Other Provides: locale(kicad-doc:ru) +Requires: %{name}-en = %{version} Requires: kicad-doc = %{version} -Requires: kicad-doc-en = %{version} %description ru This package contains Russian documentation and tutorials for KiCad %package zh Summary: Chinese documentation and tutorials for KiCad -Group: Documentation/Other Provides: locale(kicad-doc:zh) +Requires: %{name}-en = %{version} Requires: kicad-doc = %{version} -Requires: kicad-doc-en = %{version} %description zh This package contains Chinese documentation and tutorials for KiCad %prep -%setup -q +%setup -q -n %{sname}-%{version} %patch0 +%if %{with pdf} # Workaround for dblatex bug #117 - randomly selected warning symbol cp /usr/share/dblatex/latex/graphics/warning.pdf CMakeSupport/ +%endif %build +# Supported output formats: html;pdf;epub; +%if %{with pdf} # 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 -DKICAD_DOC_PATH=%{_docdir}/kicad/help -DBUILD_FORMATS='html;pdf;' +# 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' %else %cmake -DKICAD_DOC_PATH=%{_docdir}/kicad/help -DBUILD_FORMATS='html;' %endif @@ -226,15 +228,17 @@ export SOURCE_DATE_EPOCH_TEX_PRIMITIVES=1 %install %cmake_install -for lang in ca de en es fr id it ja nl pl ru zh ; do +for lang in ca de en es fr id it ja pl ru zh ; do %fdupes %{buildroot}%{_docdir}/kicad/help/$lang done +%if %{without pdf} %files %dir %{_docdir}/kicad/ %dir %{_docdir}/kicad/help/ %doc AUTHORS_README.adoc CHEATSHEET.adoc README.adoc %license LICENSE.adoc +%endif %files ca %{_docdir}/kicad/help/ca/ @@ -260,11 +264,10 @@ done %files ja %{_docdir}/kicad/help/ja/ -%files nl -%{_docdir}/kicad/help/nl/ - +%if %{without pdf} %files pl %{_docdir}/kicad/help/pl/ +%endif %files ru %{_docdir}/kicad/help/ru/