From b731fafd7a8c351dca8b28460b34418559197bd8 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Wed, 21 Apr 2021 18:02:06 +1000 Subject: [PATCH] Drop README.mysql-license, there are no exceptions MariaDB has LGPL-2.1 for the licensing of Connector/C This is the submodule in libmariadb on the server repository from which the client libraries are built. ref: https://github.com/mariadb-corporation/mariadb-connector-c From upstream: https://github.com/MariaDB/server/commit/e4da179b0352eb6a74c8c2ccf6173b171f7761a1 Cherry-picked from Fedora: https://src.fedoraproject.org/rpms/mariadb/c/00056934fb9ae670a02a9931bc9ab52554d30653?branch=rawhide Related: #1971248 --- README.mysql-license | 9 --------- mariadb.spec | 5 +---- 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 README.mysql-license diff --git a/README.mysql-license b/README.mysql-license deleted file mode 100644 index ceabbcf..0000000 --- a/README.mysql-license +++ /dev/null @@ -1,9 +0,0 @@ -MySQL is distributed under GPL v2, but there are some licensing exceptions -that allow the client libraries to be linked with a non-GPL application, -so long as the application is under a license approved by Oracle. -For details see - -http://www.mysql.com/about/legal/licensing/foss-exception/ - -Some innobase code from Percona and Google is under BSD license. -Some code related to test-suite is under LGPLv2. diff --git a/mariadb.spec b/mariadb.spec index dafdaab..41b5e9c 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -166,14 +166,12 @@ Epoch: 3 Summary: A very fast and robust SQL database server URL: http://mariadb.org -# Exceptions allow client libraries to be linked with most open source SW, not only GPL code. See README.mysql-license -License: GPLv2 with exceptions and LGPLv2 and BSD +License: GPLv2 and LGPLv2 Source0: https://downloads.mariadb.org/interstitial/mariadb-%{version}/source/mariadb-%{version}.tar.gz Source2: mysql_config_multilib.sh Source3: my.cnf.in Source6: README.mysql-docs -Source7: README.mysql-license Source10: mysql.tmpfiles.d.in Source11: mysql.service.in Source12: mysql-prepare-db-dir.sh @@ -1064,7 +1062,6 @@ ln -s %{_libexecdir}/mariadbd %{buildroot}%{_sbindir}/mariadbd # copy additional docs into build tree so %%doc will find them install -p -m 0644 %{SOURCE6} %{basename:%{SOURCE6}} -install -p -m 0644 %{SOURCE7} %{basename:%{SOURCE7}} install -p -m 0644 %{SOURCE16} %{basename:%{SOURCE16}} install -p -m 0644 %{SOURCE71} %{basename:%{SOURCE71}}