Accepting request 449849 from home:plater
Update to 4.0.5 OBS-URL: https://build.opensuse.org/request/show/449849 OBS-URL: https://build.opensuse.org/package/show/electronics/kicad-doc?expand=0&rev=11
This commit is contained in:
Dmitry Roshchin
Git OBS Bridge
parent
5520f059dd
commit
544eda1574
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5564217076641926a2523d4dc66e78810de2fe4b5bd4d2f0ba40a522203c4d27
|
||||
size 33705865
|
||||
3
kicad-doc-4.0.5.tar.gz
Normal file
3
kicad-doc-4.0.5.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fa1dac9b491a0e4863fc6fffba1ad8a610ad8a8b5552885f76f73407ed5b740f
|
||||
size 47074652
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 12 09:50:34 UTC 2017 - davejplater@gmail.com
|
||||
|
||||
- Update to version 4.0.5
|
||||
- Disabled problematic pdf builds, html is needed for kicad help.
|
||||
- Enabled Japanese and 42.x Italian packages html builds ok.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 12 08:24:41 UTC 2016 - davejplater@gmail.com
|
||||
|
||||
|
||||
118
kicad-doc.spec
118
kicad-doc.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package kicad-doc
|
||||
#
|
||||
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2017 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
|
||||
@ -16,8 +16,18 @@
|
||||
#
|
||||
|
||||
|
||||
# No texlive-collection-langjapanese in 42.1 or 13.2
|
||||
%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200
|
||||
%bcond_without japanese
|
||||
%else
|
||||
%bcond_with japanese
|
||||
%endif
|
||||
%bcond_without italian
|
||||
#eeschema_pdf_en fails to build in obs but builds local.
|
||||
%bcond_with pdf
|
||||
|
||||
Name: kicad-doc
|
||||
Version: 4.0.4
|
||||
Version: 4.0.5
|
||||
Release: 0
|
||||
Summary: Documentation and tutorials for KiCad
|
||||
License: SUSE-OldFSFDocLicense
|
||||
@ -29,6 +39,7 @@ Patch0: verbose-a2x-debug.patch
|
||||
BuildRequires: asciidoc >= 8.6.9
|
||||
BuildRequires: cmake
|
||||
BuildRequires: dblatex >= 0.3.4
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gettext >= 0.18
|
||||
BuildRequires: git
|
||||
BuildRequires: libxslt-tools
|
||||
@ -38,20 +49,18 @@ BuildRequires: texlive-collection-langeuropean
|
||||
BuildRequires: texlive-collection-langfrench
|
||||
BuildRequires: texlive-collection-langgerman
|
||||
BuildRequires: texlive-collection-langitalian
|
||||
BuildRequires: texlive-collection-langspanish
|
||||
BuildRequires: texlive-euenc
|
||||
BuildRequires: texlive-latex
|
||||
BuildRequires: texlive-xetex
|
||||
BuildRequires: texlive-xetex-def
|
||||
BuildRequires: texlive-xetex-itrans
|
||||
BuildRequires: texlive-xetex-pstricks
|
||||
BuildRequires: texlive-xetexfontinfo
|
||||
BuildRequires: texlive-xetexref
|
||||
# BuildRequires: texlive-collection-langjapanese
|
||||
%if %{with japanese}
|
||||
BuildRequires: texlive-collection-langjapanese
|
||||
BuildRequires: vlgothic-fonts
|
||||
%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: vlgothic-fonts
|
||||
BuildRequires: texlive-xetexref
|
||||
BuildRequires: perl(Unicode::LineBreak)
|
||||
BuildArch: noarch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
@ -81,7 +90,7 @@ Requires: kicad-doc = %{version}
|
||||
%description fr
|
||||
This package contains French documentation and tutorials for KiCad
|
||||
|
||||
%if 0%{?suse_version} != 1315
|
||||
%if %{with italian}
|
||||
%package it
|
||||
Summary: Italian documentation and tutorials for KiCad
|
||||
Group: Documentation/Other
|
||||
@ -92,14 +101,16 @@ Requires: kicad-doc = %{version}
|
||||
This package contains Italian documentation and tutorials for KiCad
|
||||
%endif
|
||||
|
||||
# %%package ja
|
||||
# Summary: Japanese documentation and tutorials for KiCad
|
||||
# Group: Documentation/Other
|
||||
# Provides: locale(kicad-doc:ja)
|
||||
# Requires: kicad-doc = %%{version}
|
||||
#
|
||||
# %%description ja
|
||||
# This package contains Japanese documentation and tutorials for KiCad
|
||||
%if %{with japanese}
|
||||
%package ja
|
||||
Summary: Japanese documentation and tutorials for KiCad
|
||||
Group: Documentation/Other
|
||||
Provides: locale(kicad-doc:ja)
|
||||
Requires: kicad-doc = %{version}
|
||||
|
||||
%description ja
|
||||
This package contains Japanese documentation and tutorials for KiCad
|
||||
%endif
|
||||
|
||||
%package nl
|
||||
Summary: Netherlandian documentation and tutorials for KiCad
|
||||
@ -122,7 +133,7 @@ This package contains Polish documentation and tutorials for KiCad
|
||||
%package ca
|
||||
Summary: Catalan documentation and tutorials for KiCad
|
||||
Group: Documentation/Other
|
||||
Provides: locale(kicad-doc:pl)
|
||||
Provides: locale(kicad-doc:ca)
|
||||
Requires: kicad-doc = %{version}
|
||||
|
||||
%description ca
|
||||
@ -131,7 +142,7 @@ 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:pl)
|
||||
Provides: locale(kicad-doc:de)
|
||||
Requires: kicad-doc = %{version}
|
||||
|
||||
%description de
|
||||
@ -140,7 +151,7 @@ This package contains German documentation and tutorials for KiCad
|
||||
%package es
|
||||
Summary: Spanish documentation and tutorials for KiCad
|
||||
Group: Documentation/Other
|
||||
Provides: locale(kicad-doc:pl)
|
||||
Provides: locale(kicad-doc:es)
|
||||
Requires: kicad-doc = %{version}
|
||||
|
||||
%description es
|
||||
@ -149,7 +160,7 @@ This package contains Spanish documentation and tutorials for KiCad
|
||||
%package ru
|
||||
Summary: Russian documentation and tutorials for KiCad
|
||||
Group: Documentation/Other
|
||||
Provides: locale(kicad-doc:pl)
|
||||
Provides: locale(kicad-doc:ru)
|
||||
Requires: kicad-doc = %{version}
|
||||
|
||||
%description ru
|
||||
@ -164,24 +175,63 @@ sed -i "s|share/doc/kicad|share/doc/packages/kicad|" CMakeModules/KiCadDocumenta
|
||||
%patch0
|
||||
|
||||
# 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 0%{?suse_version} == 1315
|
||||
%if %{without italian}
|
||||
find src/ -name 'addendum.it' -type f -delete -print
|
||||
find src/ -name 'it.po' -type f -delete -print
|
||||
%endif
|
||||
|
||||
%build
|
||||
%if %{with pdf}
|
||||
%cmake
|
||||
make -j1
|
||||
%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
|
||||
%endif
|
||||
|
||||
%install
|
||||
%cmake_install
|
||||
|
||||
install -Dm644 license_for_documentation.txt %{buildroot}%{_datadir}/doc/packages/kicad/
|
||||
|
||||
%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
|
||||
%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
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%dir %{_datadir}/doc/packages/kicad/
|
||||
@ -196,15 +246,17 @@ install -Dm644 license_for_documentation.txt %{buildroot}%{_datadir}/doc/package
|
||||
%defattr(-,root,root)
|
||||
%{_datadir}/doc/packages/kicad/help/fr/
|
||||
|
||||
%if 0%{?suse_version} != 1315
|
||||
%if %{with italian}
|
||||
%files it
|
||||
%defattr(-,root,root)
|
||||
%{_datadir}/doc/packages/kicad/help/it/
|
||||
%endif
|
||||
|
||||
# %%files ja
|
||||
# %%defattr(-,root,root)
|
||||
# %%{_datadir}/doc/packages/kicad/help/ja/
|
||||
%if %{with japanese}
|
||||
%files ja
|
||||
%defattr(-,root,root)
|
||||
%{_datadir}/doc/packages/kicad/help/ja/
|
||||
%endif
|
||||
|
||||
%files nl
|
||||
%defattr(-,root,root)
|
||||
@ -230,4 +282,6 @@ install -Dm644 license_for_documentation.txt %{buildroot}%{_datadir}/doc/package
|
||||
%defattr(-,root,root)
|
||||
%{_datadir}/doc/packages/kicad/help/ru/
|
||||
|
||||
# There's clearly a changelog tag
|
||||
|
||||
%changelog
|
||||
|
||||
@ -1,13 +1,27 @@
|
||||
Index: CMakeLists.txt
|
||||
===================================================================
|
||||
--- CMakeLists.txt.orig
|
||||
+++ CMakeLists.txt
|
||||
--- CMakeLists.txt.orig 2016-12-16 20:57:25.000000000 +0200
|
||||
+++ CMakeLists.txt 2017-01-10 17:02:49.599494545 +0200
|
||||
@@ -38,7 +38,7 @@ add_adoc_option( --theme flask )
|
||||
add_a2x_option( --xsltproc-opts=--nonet )
|
||||
add_a2x_option( --no-xmllint )
|
||||
add_a2x_option( -f pdf )
|
||||
-#add_a2x_option( --verbose )
|
||||
+add_a2x_option( -vv )
|
||||
+add_a2x_option( -vvv )
|
||||
|
||||
# Add a2x options depending on which PDF generator we're using
|
||||
if( ${PDF_GENERATOR} MATCHES DBLATEX )
|
||||
@@ -46,7 +46,12 @@ if( ${PDF_GENERATOR} MATCHES DBLATEX )
|
||||
# --dblatex-opts command and uses the following options for that
|
||||
add_dblatex_option( -P latex.output.revhistory=0 )
|
||||
add_dblatex_option( -P doc.publisher.show=0 )
|
||||
- add_dblatex_option( -s ${PROJECT_SOURCE_DIR}/CMakeSupport/pdf-cover-dblatex.sty )
|
||||
+ add_dblatex_option( --no-batch )
|
||||
+ add_dblatex_option( -d )
|
||||
+ add_dblatex_option( -D )
|
||||
+ add_dblatex_option( -V )
|
||||
+ add_dblatex_option( -s ${PROJECT_SOURCE_DIR}/utils/old-build-scripts/pdf-cover-dblatex.sty)
|
||||
+ # /CMakeSupport/pdf-cover-dblatex.sty )
|
||||
|
||||
find_package( DBLATEX REQUIRED )
|
||||
endif()
|
||||
|
||||
Loading…
Reference in New Issue
Block a user