Dominique Leuenberger 2018-09-04 20:54:02 +00:00 committed by Git OBS Bridge
commit 88c9431fd9
6 changed files with 31 additions and 88 deletions

View File

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

3
kicad-doc-5.0.0.tar.gz Normal file
View File

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

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sun Jul 22 15:32:43 UTC 2018 - davejplater@gmail.com
- Update to version 5.0.0, rebase verbose-a2x-debug.patch.
- Is now dual GPL-3.0+ and CC-BY-SA-3.0 licensed
- Added Chinese documentation.
-------------------------------------------------------------------
Mon Sep 4 14:04:53 UTC 2017 - davejplater@gmail.com

View File

@ -1,7 +1,7 @@
#
# spec file for package kicad-doc
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 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
@ -27,14 +27,14 @@
%bcond_with pdf
Name: kicad-doc
Version: 4.0.7
Version: 5.0.0
Release: 0
Summary: Documentation and tutorials for KiCad
License: SUSE-OldFSFDocLicense
#-or-later
License: GPL-3.0-or-later AND CC-BY-SA-3.0
Group: Documentation/Other
Url: http://kicad-pcb.org
Source: https://github.com/KiCad/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source2: https://raw.githubusercontent.com/KiCad/kicad-source-mirror/master/license_for_documentation.txt
Patch0: verbose-a2x-debug.patch
# PATCH-FIX-OPENSUSE kicad-doc-notimestamp.patch davejplater@gmail.com -- Remove time stamped footer from html pages.
Patch1: kicad-doc-notimestamp.patch
@ -179,9 +179,17 @@ Requires: kicad-doc = %{version}
%description id
This package contains Indonesian documentation and tutorials for KiCad
%package zh
Summary: Chinese documentation and tutorials for KiCad
Group: Documentation/Other
Provides: locale(kicad-doc:id)
Requires: kicad-doc = %{version}
%description zh
This package contains Chinese documentation and tutorials for KiCad
%prep
%setup -q
cp %{SOURCE2} .
# Fix documentation path
sed -i "s|share/doc/kicad|share/doc/packages/kicad|" CMakeModules/KiCadDocumentation.cmake
@ -229,8 +237,6 @@ make eeschema_pdf_en
%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
@ -251,7 +257,8 @@ install -Dm644 license_for_documentation.txt %{buildroot}%{_datadir}/doc/package
%defattr(-,root,root)
%dir %{_datadir}/doc/packages/kicad/
%dir %{_datadir}/doc/packages/kicad/help/
%{_datadir}/doc/packages/kicad/license_for_documentation.txt
%doc AUTHORS_README.adoc CHEATSHEET.adoc README.adoc
%license LICENSE.adoc
%files en
%defattr(-,root,root)
@ -301,6 +308,10 @@ install -Dm644 license_for_documentation.txt %{buildroot}%{_datadir}/doc/package
%defattr(-,root,root)
%{_datadir}/doc/packages/kicad/help/id/
%files zh
%defattr(-,root,root)
%{_datadir}/doc/packages/kicad/help/zh/
# There's clearly a changelog tag
%changelog

View File

@ -1,61 +0,0 @@
KiCad Free Documentation Licence
================================
Copyright (c) jean-pierre Charras
Copyright (C) KiCad Developers
Everyone is permitted to copy and distribute verbatim copies
of this licence document, but changing it is not allowed.
KICAD FREE DOCUMENTATION LICENCE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
1. Permission is granted to make and distribute verbatim copies of this
manual or piece of documentation provided any copyright notice and this
permission notice are preserved on all copies.
2. Permission is granted to process this file or document through a
document processing system and, at your option and the option of any third
party, print the results, provided a printed document carries a copying
permission notice identical to this one.
3. Permission is granted to copy and distribute modified versions of this
manual or piece of documentation under the conditions for verbatim
copying, provided also that any sections describing licensing conditions
for this manual, such as, in particular, the GNU General Public Licence,
the GNU Library General Public Licence, and any wxWindows Licence are
included exactly as in the original, and provided that the entire
resulting derived work is distributed under the terms of a permission
notice identical to this one.
4. Permission is granted to copy and distribute translations of this
manual or piece of documentation into another language, under the above
conditions for modified versions, except that sections related to
licensing, including this paragraph, may also be included in translations
approved by the copyright holders of the respective licence documents in
addition to the original French or English.
WARRANTY DISCLAIMER
5. BECAUSE THIS MANUAL OR PIECE OF DOCUMENTATION IS LICENSED FREE OF CHARGE,
THERE IS NO WARRANTY FOR IT, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER
PARTIES PROVIDE THIS MANUAL OR PIECE OF DOCUMENTATION "AS IS" WITHOUT
WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF
THE MANUAL OR PIECE OF DOCUMENTATION IS WITH YOU. SHOULD THE MANUAL OR
PIECE OF DOCUMENTATION PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
NECESSARY SERVICING, REPAIR OR CORRECTION.
6. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE MANUAL OR PIECE OF DOCUMENTATION AS PERMITTED ABOVE, BE
LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
MANUAL OR PIECE OF DOCUMENTATION (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF A PROGRAM BASED ON THE MANUAL OR PIECE OF
DOCUMENTATION TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR
OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

View File

@ -1,7 +1,7 @@
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt.orig 2016-12-16 20:57:25.000000000 +0200
+++ CMakeLists.txt 2017-01-10 17:02:49.599494545 +0200
--- CMakeLists.txt.orig 2018-07-22 17:19:48.778967851 +0200
+++ CMakeLists.txt 2018-07-22 17:26:56.850761259 +0200
@@ -38,7 +38,7 @@ add_adoc_option( --theme flask )
add_a2x_option( --xsltproc-opts=--nonet )
add_a2x_option( --no-xmllint )
@ -11,17 +11,3 @@ Index: CMakeLists.txt
# 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()