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 <ncutler@suse.com>

diff --git a/COPYING b/COPYING
index 189b1acb28a30158268627a50bd5b731a33bc7d4..b7371e4f9c0592b9cf9161bd6b6bfaf648ce75fc 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -30,10 +30,6 @@ Files: src/common/bloom_filter.hpp
 Copyright: Copyright (C) 2000 Arash Partow <arash@partow.net>
 License: Boost Software License, Version 1.0
 
-Files: m4/acx_pthread.m4
-Copyright: Steven G. Johnson <stevenj@alum.mit.edu>
-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 9b9ff933ae9ce016088ae07c41b0813c88c3ae26..ceef0f4e6baf085ed271e5ad0ae7d04b2deaade3 100644 (file)
--- 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 c4c4a3b679ced027545bbbf96ba36700df49dc6b..362ae78f29135baf4336aa451bc5057cc4c209ca 100644 (file)
--- 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 <stevenj@alum.mit.edu>
-License: GPLWithACException
-
 Files: src/common/crc32c_intel*:
 Copyright:
     Copyright 2012-2013 Intel Corporation All Rights Reserved.