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>
(cherry picked from commit 1d53c28cbbf5672dfe9bc75247268dd7e912a647)

Conflicts:
	ceph.spec.in (upstream doesn't use the SPDX 2.0 syntax)

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 28b1441c1ddf1d816a14f980c08f83b6a6baea70..8dfeefb83ad1e72f05f60dfc04b8b2dddbd004bf 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -79,7 +79,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-2.0 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