From f098796bc25f4c6b9b6631dcea018502d451ff8d8108083df0f85957955ebbf5 Mon Sep 17 00:00:00 2001 From: "Michal Hrusecky (old before rename to _miska_)" Date: Sat, 18 Feb 2012 08:26:22 +0000 Subject: [PATCH] - updated license to conform new policy OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=69 --- configuration-tweaks.tar.bz2 | 4 ++-- mariadb.changes | 5 +++++ mariadb.spec | 31 ++++++++++++++++--------------- 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/configuration-tweaks.tar.bz2 b/configuration-tweaks.tar.bz2 index d13a8e2..dada58a 100644 --- a/configuration-tweaks.tar.bz2 +++ b/configuration-tweaks.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5574998e9d4324ff05c8bd698e0bd3cd92b1f449b855759dc6d6db5a486bf053 -size 217 +oid sha256:187fb389fc6882201597ce11c267a738d75bd1756306c7bb992eb5ecdcd0d1d2 +size 218 diff --git a/mariadb.changes b/mariadb.changes index 8120fef..228e388 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Feb 18 08:25:25 UTC 2012 - mhrusecky@suse.cz + +- updated license to conform new policy + ------------------------------------------------------------------- Mon Jan 30 08:46:31 UTC 2012 - mhrusecky@suse.cz diff --git a/mariadb.spec b/mariadb.spec index 07ac9f0..42b6250 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -35,7 +35,7 @@ Summary: Server part of MariaDB Version: 5.2.10 Release: 1 %define srv_vers 5.1.60 -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Group: Productivity/Databases/Servers Url: http://www.mariab.org Source: mariadb-%{version}.tar.bz2 @@ -57,6 +57,7 @@ PreReq: %install_info_prereq %insserv_prereq %endif BuildRequires: gcc-c++ ncurses-devel openssl-devel procps readline-devel BuildRequires: autoconf automake cmake libtool zlib-devel +BuildRequires: pam-devel %if 0%{?suse_version} BuildRequires: pwdutils tcpd-devel %endif @@ -100,7 +101,7 @@ Requires: glibc-devel Requires: openssl-devel Requires: zlib-devel Summary: MariaDB development header files and libraries -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Group: Development/Libraries/C and C++ %description -n libmysqlclient-devel @@ -108,7 +109,7 @@ This package contains the development header files and libraries necessary to develop client applications for MariaDB. %package -n libmysqld16 -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Summary: MariaDB embedded server development files Group: Development/Libraries/C and C++ @@ -117,7 +118,7 @@ This package contains the development header files and libraries for developing applications that embed the MariaDB. %package -n libmysqld-devel -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Summary: MariaDB embedded server development files # the headers files are the shared Requires: libmysqlclient-devel = %version @@ -132,7 +133,7 @@ for developing applications that embed the MariaDB. %package -n libmariadbclient16 Summary: Shared Libraries for MariaDB -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Group: Development/Libraries/Other %description -n libmariadbclient16 @@ -141,7 +142,7 @@ languages and applications need to dynamically load and use MariaDB. %package -n libmariadbclient_r16 Summary: Shared Libraries for MariaDB -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Group: Development/Libraries/Other %description -n libmariadbclient_r16 @@ -149,7 +150,7 @@ This package contains the shared libraries (.so) which certain languages and applications need to dynamically load and use MariaDB. %package client -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Summary: Client for MariaDB Group: Productivity/Databases/Clients Provides: mysql-client = %{srv_vers} @@ -163,7 +164,7 @@ This package contains the standard clients for MariaDB. %package bench Requires: %{name}-client perl-DBD-mysql -License: LGPLv2.1 +License: LSUSE-GPL-2.0-with-FLOSS-exception Summary: Benchmarks for MariaDB Group: Productivity/Databases/Tools Provides: mysql-bench = %{srv_vers} @@ -180,7 +181,7 @@ the directory /usr/share/sql-bench after starting MariaDB. %package debug-version -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Summary: MariaDB with debug options turned on Group: Productivity/Databases/Servers Requires: %{name} = %{version} @@ -199,7 +200,7 @@ standard server. Read /usr/share/doc/packages/mysql/README.debug for information on how to use the debug server. %package test -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Summary: Testsuite for MariaDB Group: Productivity/Databases/Servers Requires: %{name} = %{version} @@ -219,7 +220,7 @@ This package contains the test scripts and data for MariaDB. To run the testsuite, run /usr/share/mysql-test/suse-test-run. %package tools -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Summary: MariaDB tools Group: Productivity/Databases/Servers Requires: perl-DBD-mysql @@ -238,7 +239,7 @@ applications with MariaDB. %if 0%{?cluster} > 0 %package ndb-storage -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Summary: MariaDB - ndbcluster storage engine Group: Productivity/Databases/Servers Provides: mysql-ndb-storage = %{srv_vers} @@ -252,7 +253,7 @@ computers that should store ndbcluster table data. %package ndb-management -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Summary: MariaDB - ndbcluster storage engine management Group: Productivity/Databases/Servers Provides: mysql-ndb-management = %{srv_vers} @@ -265,7 +266,7 @@ It is necessary to have this package installed on at least one computer in the cluster. %package ndb-tools -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Summary: MariaDB - ndbcluster storage engine basic tools Group: Productivity/Databases/Servers Provides: mysql-ndb-tools = %{srv_vers} @@ -276,7 +277,7 @@ Conflicts: otherproviders(mysql-ndb-tools) This package contains ndbcluster storage engine basic tools. %package ndb-extra -License: GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT +License: SUSE-GPL-2.0-with-FLOSS-exception Summary: MariaDB - ndbcluster storage engine extra tools Group: Productivity/Databases/Servers Provides: mysql-ndb-extra = %{srv_vers}