From 0f2f7d60a22d16db7767b5c05d14a30d6377201a Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Fri, 26 May 2017 10:22:50 +0200 Subject: [PATCH] build/ops: rpm, COPYING: drop GPL 2.0 with Autoconf Exception This license is no longer used. Fixes: http://tracker.ceph.com/issues/20091 Signed-off-by: Nathan Cutler --- COPYING | 4 ---- ceph.spec.in | 4 ++-- debian/copyright | 4 ---- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/COPYING b/COPYING index 189b1acb28a30..b7371e4f9c059 100644 --- a/COPYING +++ b/COPYING @@ -30,10 +30,6 @@ Files: src/common/bloom_filter.hpp Copyright: Copyright (C) 2000 Arash Partow License: Boost Software License, Version 1.0 -Files: m4/acx_pthread.m4 -Copyright: Steven G. Johnson -License: GPLWithACException - Files: src/common/crc32c_intel*: Copyright: Copyright 2012-2013 Intel Corporation All Rights Reserved. diff --git a/ceph.spec.in b/ceph.spec.in index 9b9ff933ae9ce..ceef0f4e6baf0 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -72,7 +72,7 @@ Epoch: 1 %global _epoch_prefix %{?epoch:%{epoch}:} Summary: User space components of the Ceph file system -License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT +License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and MIT %if 0%{?suse_version} Group: System/Filesystems %endif @@ -318,7 +318,7 @@ of cluster membership, configuration, and state. %package mgr Summary: Ceph Manager Daemon -License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and GPL-2.0-with-autoconf-exception and BSD-3-Clause and MIT +License: LGPL-2.1 and CC-BY-SA-1.0 and GPL-2.0 and BSL-1.0 and BSD-3-Clause and MIT %if 0%{?suse_version} Group: System/Filesystems %endif diff --git a/debian/copyright b/debian/copyright index c4c4a3b679ced..362ae78f29135 100644 --- a/debian/copyright +++ b/debian/copyright @@ -33,10 +33,6 @@ Files: src/common/bloom_filter.hpp Copyright: Copyright (C) 2000 Arash Partow License: Boost Software License, Version 1.0 -Files: m4/acx_pthread.m4 -Copyright: Steven G. Johnson -License: GPLWithACException - Files: src/common/crc32c_intel*: Copyright: Copyright 2012-2013 Intel Corporation All Rights Reserved. -- 2.39.5