From 17214140857e21b0bc08174f3113808914e038fc1b581cddcc59ce55db16ec2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 19 Jun 2017 13:20:14 +0000 Subject: [PATCH] - Cleanup the License string OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=506 --- libreoffice.changes | 5 +++++ libreoffice.spec | 32 +------------------------------- 2 files changed, 6 insertions(+), 31 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index acd9bbc..9ae1558 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 19 13:20:00 UTC 2017 - tchvatal@suse.com + +- Cleanup the License string + ------------------------------------------------------------------- Tue Jun 13 13:46:31 UTC 2017 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 329bad4..5628357 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -38,7 +38,7 @@ Name: libreoffice Version: 5.4.0.0.beta2 Release: 0 Summary: A Free Office Suite (Framework) -License: Apache-2.0 and BSD-3-Clause and BSD-4-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT and SUSE-Public-Domain and W3C +License: LGPL-3.0+ and MPL-2.0+ Group: Productivity/Office/Suite Url: http://www.documentfoundation.org/ Source0: %{tarball_url}/libreoffice-%{version}.tar.xz @@ -294,7 +294,6 @@ example: %package branding-upstream Summary: Original Branding for LibreOffice -License: Apache-2.0 and Artistic-1.0 and BSD-3-Clause and BSD-4-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT and SUSE-Public-Domain and W3C Group: Productivity/Office/Suite Supplements: packageand(libreoffice:branding-upstream) Conflicts: otherproviders(libreoffice-branding) @@ -308,7 +307,6 @@ This package includes the original branding for the LibreOffice office suite. %package icon-theme-breeze Summary: Breeze LibreOffice Icon Theme (KDE Frameworks default) -License: LGPL-2.1 Group: Productivity/Office/Suite Requires: %{name}-icon-theme-galaxy Requires(post): %{name}-share-linker @@ -324,7 +322,6 @@ Frameworks by default. %package icon-theme-galaxy Summary: Galaxy LibreOffice Icon Theme (OOo-3.x default) -License: LGPL-3.0 Group: Productivity/Office/Suite Requires(post): %{name}-share-linker Requires(postun): %{name}-share-linker @@ -338,7 +335,6 @@ This package provides Galaxy LibreOffice icon theme. It is used in the original %package icon-theme-hicontrast Summary: Hicontrast LibreOffice Icon Theme -License: LGPL-3.0 Group: Productivity/Office/Suite Requires: %{name}-icon-theme-galaxy Requires(post): %{name}-share-linker @@ -353,7 +349,6 @@ This package provides Hicontrast LibreOffice icon theme. %package icon-theme-sifr Summary: Sifr LibreOffice Icon Theme -License: LGPL-3.0 Group: Productivity/Office/Suite Requires: %{name}-icon-theme-breeze Requires: %{name}-icon-theme-galaxy @@ -369,7 +364,6 @@ This package provides Sifr LibreOffice icon theme. %package icon-theme-tango Summary: Tango LibreOffice Icon Theme (GNOME default) -License: LGPL-3.0 Group: Productivity/Office/Suite Requires: %{name}-icon-theme-galaxy Requires(post): %{name}-share-linker @@ -385,7 +379,6 @@ and obsoleted the old Industrial theme. %package glade Summary: Support for creating LibreOffice dialogs in glade -License: Apache-2.0 and Artistic-1.0 and BSD-3-Clause and BSD-4-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT and SUSE-Public-Domain and W3C Group: Productivity/Office/Suite Requires: %{name} = %{version} BuildArch: noarch @@ -396,7 +389,6 @@ glade and ui-previewer tool to check the visual appearance of dialogs. %package gdb-pretty-printers Summary: Additional support for debugging with gdb -License: Apache-2.0 and Artistic-1.0 and BSD-3-Clause and BSD-4-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT and SUSE-Public-Domain and W3C Group: Productivity/Office/Suite Requires: gdb Requires: libreoffice = %{version} @@ -409,7 +401,6 @@ This package provides gdb pretty printers for package %{name}. %package base Summary: LibreOffice Base -License: LGPL-3.0 Group: Productivity/Office/Suite Requires: %{name} = %{version} Requires: pentaho-reporting-flow-engine @@ -428,7 +419,6 @@ suite. %package calc Summary: LibreOffice Calc -License: LGPL-3.0 Group: Productivity/Office/Suite Requires: %{name} = %{version} Supplements: %{name} @@ -439,7 +429,6 @@ manage lists in spreadsheets by using LibreOffice office suite. %package draw Summary: LibreOffice Draw -License: LGPL-3.0 Group: Productivity/Office/Suite Requires: %{name} = %{version} Supplements: %{name} @@ -450,7 +439,6 @@ logos by using LibreOffice office suite. %package math Summary: LibreOffice Math -License: LGPL-3.0 Group: Productivity/Office/Suite Requires: %{name} = %{version} Supplements: %{name} @@ -461,7 +449,6 @@ equations by using LibreOffice office suite. %package impress Summary: LibreOffice Impress -License: LGPL-3.0 Group: Productivity/Office/Suite Requires: %{name} = %{version} Supplements: %{name} @@ -472,7 +459,6 @@ meeting and Web pages by using LibreOffice office suite. %package writer Summary: LibreOffice Writer and Web -License: LGPL-3.0 Group: Productivity/Office/Suite Requires: %{name} = %{version} Supplements: %{name} @@ -483,7 +469,6 @@ reports, documents and Web pages by using LibreOffice office suite. %package base-drivers-postgresql Summary: PostgreSQL Database Driver for LibreOffice -License: LGPL-2.1+ Group: Productivity/Office/Suite Requires: postgresql @@ -492,7 +477,6 @@ This package allows to access PostgreSQL databases from LibreOffice Base. %package base-drivers-firebird Summary: Firebird Database Driver for LibreOffice -License: LGPL-2.1+ Group: Productivity/Office/Suite Requires: firebird @@ -501,7 +485,6 @@ This package allows to access Firebird databeses from LibreOffice Base. %package filters-optional Summary: Additional Import and Export Filters for LibreOffice -License: LGPL-3.0 Group: Productivity/Office/Suite Requires: %{name}-calc = %{version} Requires: %{name}-draw = %{version} @@ -521,7 +504,6 @@ LibreOffice: %package mailmerge Summary: Mail Merge Functionality for LibreOffice -License: LGPL-3.0 Group: Productivity/Office/Suite Requires: %{name}-pyuno = %{version} Supplements: %{name} @@ -532,7 +514,6 @@ to many recipients using LibreOffice office suite. %package pyuno Summary: Python UNO Bridge for LibreOffice -License: LGPL-3.0 Group: Productivity/Office/Suite Requires: %{name} = %{version} Supplements: %{name} @@ -551,7 +532,6 @@ http://udk.openoffice.org/python/python-bridge.html %package gnome Summary: GNOME Extensions for LibreOffice -License: LGPL-3.0 Group: Productivity/Office/Suite Requires: %{name} = %{version} @@ -560,7 +540,6 @@ This package contains some GNOME extensions and GTK2 interface for LibreOffice. %package gtk3 Summary: Gtk3 interface for LibreOffice -License: LGPL-3.0 Group: Productivity/Office/Suite Requires: %{name}-gnome = %{version} %if 0%{?suse_version} > 1315 || 0%{?is_opensuse} @@ -572,7 +551,6 @@ This package contains Gtk3 interface rendering option for LibreOffice. %package kde4 Summary: KDE4 Extensions for LibreOffice -License: LGPL-3.0 Group: Productivity/Office/Suite Requires: %{name} = %{version} @@ -581,7 +559,6 @@ This package contains some KDE4 extensions for LibreOffice. %package sdk Summary: LibreOffice SDK -License: LGPL-3.0 Group: Documentation/HTML Requires: %{name} = %{version} Requires: gcc-c++ @@ -601,7 +578,6 @@ The documentation is in the package libreoffice-sdk-doc %package sdk-doc Summary: LibreOffice SDK Documentation -License: LGPL-3.0 Group: Development/Libraries/Other Suggests: %{name}-sdk = %{version} Enhances: %{name}-sdk = %{version} @@ -614,7 +590,6 @@ Software Development Kit (SDK). %package officebean Summary: OfficeBean Java Bean component for LibreOffice -License: LGPL-3.0 Group: Productivity/Office/Suite Requires: %{name} = %{version} %ifarch %arm %ix86 ppc @@ -644,7 +619,6 @@ appearance and behavior. Summary: MySQL Database Driver for LibreOffice # This mysql thing is just dlopened # WARNING: the soname might change! -License: GPL-2.0 and LGPL-3.0 Group: Productivity/Office/Suite Requires: libmysqlclient_r18 Requires: libreoffice-base = %{version} @@ -656,7 +630,6 @@ This package allows to access MySQL databases from LibreOffice Base. %package calc-extensions Summary: LibreOffice Calc Extensions -License: LGPL-2.1+ and LGPL-3.0 Group: Productivity/Office/Suite Requires: libreoffice-calc = %{version} # pyuno is needed for the numbertext extension @@ -679,7 +652,6 @@ This package provides extensions for LibreOffice Calc: %package writer-extensions Summary: LibreOffice Writer Extensions -License: Apache-2.0 and LGPL-3.0 and CDDL-1.0 Group: Productivity/Office/Suite Requires: libreoffice-writer = %{version} Requires(pre): libreoffice = %{version} @@ -698,7 +670,6 @@ This package provides extensions for LibreOffice Writer: %package -n libreofficekit Summary: A library providing access to LibreOffice functionality -License: MPL-2.0 Group: Productivity/Office/Suite Requires: %{name} = %{version} @@ -708,7 +679,6 @@ through C/C++, without any need to use UNO. %package -n libreofficekit-devel Summary: Development files for libreofficekit -License: MPL-2.0 Group: Productivity/Office/Suite Requires: libreofficekit = %{version}