From 10b4e044c16a5e9fc6c472995f6c1df40c2c270534d48ee2936d6fa5d6d33265 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Sun, 30 Sep 2018 07:50:24 +0000 Subject: [PATCH] Accepting request 639175 from home:StefanBruens:branches:electronics - Rename kicad-doc to kicad-doc-common, avoid shadowing actual documentation packages providing locale specific kicad-doc. - Require kicad-doc-en from other translation subpackages to provide a fallback for incomplete translations. OBS-URL: https://build.opensuse.org/request/show/639175 OBS-URL: https://build.opensuse.org/package/show/electronics/kicad-doc?expand=0&rev=24 --- kicad-doc.changes | 8 +++++++ kicad-doc.spec | 57 +++++++++++++++++++++++++++++++++++------------ 2 files changed, 51 insertions(+), 14 deletions(-) diff --git a/kicad-doc.changes b/kicad-doc.changes index 26d3beb..80f73d9 100644 --- a/kicad-doc.changes +++ b/kicad-doc.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Sep 29 23:45:52 UTC 2018 - Stefan Brüns + +- Rename kicad-doc to kicad-doc-common, avoid shadowing actual + documentation packages providing locale specific kicad-doc. +- Require kicad-doc-en from other translation subpackages + to provide a fallback for incomplete translations. + ------------------------------------------------------------------- Sun Aug 5 00:24:13 UTC 2018 - stefan.bruens@rwth-aachen.de diff --git a/kicad-doc.spec b/kicad-doc.spec index d644f68..f82fac4 100644 --- a/kicad-doc.spec +++ b/kicad-doc.spec @@ -83,11 +83,19 @@ schematic diagrams and printed circuit board artwork. This is the documentation package for KiCad. It contains documentation and tutorials. +%package common +Summary: Common files for documentation packages +Group: Documentation/Other + +%description common +This package contains common files required for the individual translations + %package en Summary: English documentation and tutorials for KiCad Group: Documentation/Other +Provides: kicad-doc = %{version} Provides: locale(kicad-doc:en) -Requires: kicad-doc = %{version} +Requires: kicad-doc-common = %{version} %description en This package contains English documentation and tutorials for KiCad @@ -95,8 +103,10 @@ This package contains English documentation and tutorials for KiCad %package fr Summary: French documentation and tutorials for KiCad Group: Documentation/Other +Provides: kicad-doc = %{version} Provides: locale(kicad-doc:fr) -Requires: kicad-doc = %{version} +Requires: kicad-doc-common = %{version} +Requires: kicad-doc-en = %{version} %description fr This package contains French documentation and tutorials for KiCad @@ -104,8 +114,10 @@ This package contains French documentation and tutorials for KiCad %package it Summary: Italian documentation and tutorials for KiCad Group: Documentation/Other +Provides: kicad-doc = %{version} Provides: locale(kicad-doc:it) -Requires: kicad-doc = %{version} +Requires: kicad-doc-common = %{version} +Requires: kicad-doc-en = %{version} %description it This package contains Italian documentation and tutorials for KiCad @@ -113,8 +125,10 @@ This package contains Italian documentation and tutorials for KiCad %package ja Summary: Japanese documentation and tutorials for KiCad Group: Documentation/Other +Provides: kicad-doc = %{version} Provides: locale(kicad-doc:ja) -Requires: kicad-doc = %{version} +Requires: kicad-doc-common = %{version} +Requires: kicad-doc-en = %{version} %description ja This package contains Japanese documentation and tutorials for KiCad @@ -122,8 +136,10 @@ This package contains Japanese documentation and tutorials for KiCad %package nl Summary: Netherlandian documentation and tutorials for KiCad Group: Documentation/Other +Provides: kicad-doc = %{version} Provides: locale(kicad-doc:nl) -Requires: kicad-doc = %{version} +Requires: kicad-doc-common = %{version} +Requires: kicad-doc-en = %{version} %description nl This package contains Netherlandian documentation and tutorials for KiCad @@ -131,8 +147,10 @@ This package contains Netherlandian documentation and tutorials for KiCad %package pl Summary: Polish documentation and tutorials for KiCad Group: Documentation/Other +Provides: kicad-doc = %{version} Provides: locale(kicad-doc:pl) -Requires: kicad-doc = %{version} +Requires: kicad-doc-common = %{version} +Requires: kicad-doc-en = %{version} %description pl This package contains Polish documentation and tutorials for KiCad @@ -140,8 +158,10 @@ This package contains Polish documentation and tutorials for KiCad %package ca Summary: Catalan documentation and tutorials for KiCad Group: Documentation/Other +Provides: kicad-doc = %{version} Provides: locale(kicad-doc:ca) -Requires: kicad-doc = %{version} +Requires: kicad-doc-common = %{version} +Requires: kicad-doc-en = %{version} %description ca This package contains Catalan documentation and tutorials for KiCad @@ -149,8 +169,10 @@ This package contains Catalan documentation and tutorials for KiCad %package de Summary: German documentation and tutorials for KiCad Group: Documentation/Other +Provides: kicad-doc = %{version} Provides: locale(kicad-doc:de) -Requires: kicad-doc = %{version} +Requires: kicad-doc-common = %{version} +Requires: kicad-doc-en = %{version} %description de This package contains German documentation and tutorials for KiCad @@ -158,8 +180,10 @@ This package contains German documentation and tutorials for KiCad %package es Summary: Spanish documentation and tutorials for KiCad Group: Documentation/Other +Provides: kicad-doc = %{version} Provides: locale(kicad-doc:es) -Requires: kicad-doc = %{version} +Requires: kicad-doc-common = %{version} +Requires: kicad-doc-en = %{version} %description es This package contains Spanish documentation and tutorials for KiCad @@ -167,8 +191,10 @@ This package contains Spanish documentation and tutorials for KiCad %package ru Summary: Russian documentation and tutorials for KiCad Group: Documentation/Other +Provides: kicad-doc = %{version} Provides: locale(kicad-doc:ru) -Requires: kicad-doc = %{version} +Requires: kicad-doc-common = %{version} +Requires: kicad-doc-en = %{version} %description ru This package contains Russian documentation and tutorials for KiCad @@ -176,8 +202,10 @@ This package contains Russian documentation and tutorials for KiCad %package id Summary: Indonesian documentation and tutorials for KiCad Group: Documentation/Other +Provides: kicad-doc = %{version} Provides: locale(kicad-doc:id) -Requires: kicad-doc = %{version} +Requires: kicad-doc-common = %{version} +Requires: kicad-doc-en = %{version} %description id This package contains Indonesian documentation and tutorials for KiCad @@ -185,8 +213,10 @@ This package contains Indonesian documentation and tutorials for KiCad %package zh Summary: Chinese documentation and tutorials for KiCad Group: Documentation/Other +Provides: kicad-doc = %{version} Provides: locale(kicad-doc:zh) -Requires: kicad-doc = %{version} +Requires: kicad-doc-common = %{version} +Requires: kicad-doc-en = %{version} %description zh This package contains Chinese documentation and tutorials for KiCad @@ -220,7 +250,7 @@ for lang in ca de en es fr id it ja nl pl ru zh ; do %fdupes %{buildroot}%{_docdir}/kicad/help/$lang done -%files +%files common %dir %{_docdir}/kicad/ %dir %{_docdir}/kicad/help/ %doc AUTHORS_README.adoc CHEATSHEET.adoc README.adoc @@ -230,7 +260,6 @@ done %{_docdir}/kicad/help/en/ %files fr -%defattr(-,root,root) %{_docdir}/kicad/help/fr/ %files it