| Message ID | 4FF1F183.60507@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Applied, thanks! I think the mtab.c should eventually move to ceph-fs-common to mirror the debian package structure (mount.ceph, cephfs tool). It's probably not worth replacing fiemap.cc, though, until someone actually makes a plugin interface and wants to link to the ceph-osd binary that uses it. sage On Mon, 2 Jul 2012, Holger Macht wrote: > LGPLv2 in spec file is not correct, because some of the included > packages/binaries are GPLv2. For example: > > src/mount/mtab.c -> package ceph, binary mount.ceph > src/common/fiemap.cc -> package ceph, binary rbd > > Also use SPDX format (http://www.spdx.org/licenses) for the sub-package > licenses. > > Signed-off-by: Holger Macht <hmacht@suse.de> > --- > ceph.spec.in | 18 ++++++++++-------- > 1 file changed, 10 insertions(+), 8 deletions(-) > > diff --git a/ceph.spec.in b/ceph.spec.in > index 461bd1f..d80cb46 100644 > --- a/ceph.spec.in > +++ b/ceph.spec.in > @@ -17,7 +17,7 @@ Name: ceph > Version: @VERSION@ > Release: 6%{?dist} > Summary: User space components of the Ceph file system > -License: LGPLv2 > +License: GPL-2.0 > Group: System Environment/Base > URL: http://ceph.com/ > Source0: http://ceph.com/download/%{name}-%{version}.tar.bz2 > @@ -73,6 +73,7 @@ performance, reliability, and scalability. > %package fuse > Summary: Ceph fuse-based client > Group: System Environment/Base > +License: LGPL-2.0 > Requires: %{name} = %{version}-%{release} > BuildRequires: fuse-devel > %description fuse > @@ -81,7 +82,7 @@ FUSE based client for Ceph distributed network file system > %package devel > Summary: Ceph headers > Group: Development/Libraries > -License: LGPLv2 > +License: LGPL-2.0 > Requires: %{name} = %{version}-%{release} > Requires: librados2 = %{version} > Requires: librbd1 = %{version} > @@ -93,6 +94,7 @@ that use Ceph. > %package radosgw > Summary: Rados REST gateway > Group: Development/Libraries > +License: LGPL-2.0 > Requires: librados2 = %{version}-%{release} > %if 0%{defined suse_version} > BuildRequires: libexpat-devel > @@ -111,7 +113,7 @@ conjunction with any FastCGI capable web server. > %package obsync > Summary: synchronize data between cloud object storage providers or a local directory > Group: Productivity/Networking/Other > -License: LGPLv2 > +License: LGPL-2.0 > Requires: python, python-boto > %description obsync > obsync is a tool to synchronize objects between cloud object > @@ -122,7 +124,7 @@ Ceph RADOS cluster, or a local directory. > %package resource-agents > Summary: OCF-compliant resource agents for Ceph daemons > Group: System Environment/Base > -License: LGPLv2 > +License: LGPL-2.0 > Requires: %{name} = %{version} > Requires: resource-agents > %description resource-agents > @@ -134,7 +136,7 @@ managers such as Pacemaker. > %package -n librados2 > Summary: RADOS distributed object store client library > Group: System Environment/Libraries > -License: LGPLv2 > +License: LGPL-2.0 > %description -n librados2 > RADOS is a reliable, autonomic distributed object storage cluster > developed as part of the Ceph distributed storage system. This is a > @@ -144,7 +146,7 @@ store using a simple file-like interface. > %package -n librbd1 > Summary: RADOS block device client library > Group: System Environment/Libraries > -License: LGPLv2 > +License: LGPL-2.0 > Requires: librados2 = %{version}-%{release} > %description -n librbd1 > RBD is a block device striped across multiple distributed objects in > @@ -155,7 +157,7 @@ shared library allowing applications to manage these block devices. > %package -n libcephfs1 > Summary: Ceph distributed file system client library > Group: System Environment/Libraries > -License: LGPLv2 > +License: LGPL-2.0 > %description -n libcephfs1 > Ceph is a distributed network file system designed to provide excellent > performance, reliability, and scalability. This is a shared library > @@ -165,7 +167,7 @@ POSIX-like interface. > %package -n python-ceph > Summary: Python libraries for the Ceph distributed filesystem > Group: System Environment/Libraries > -License: LGPLv2 > +License: LGPL-2.0 > Requires: librados2 = %{version}-%{release} > Requires: librbd1 = %{version}-%{release} > Requires: libcephfs1 = %{version}-%{release} > -- > 1.7.9.5 > > -- > To unsubscribe from this list: send the line "unsubscribe ceph-devel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > > -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/ceph.spec.in b/ceph.spec.in index 461bd1f..d80cb46 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -17,7 +17,7 @@ Name: ceph Version: @VERSION@ Release: 6%{?dist} Summary: User space components of the Ceph file system -License: LGPLv2 +License: GPL-2.0 Group: System Environment/Base URL: http://ceph.com/ Source0: http://ceph.com/download/%{name}-%{version}.tar.bz2 @@ -73,6 +73,7 @@ performance, reliability, and scalability. %package fuse Summary: Ceph fuse-based client Group: System Environment/Base +License: LGPL-2.0 Requires: %{name} = %{version}-%{release} BuildRequires: fuse-devel %description fuse @@ -81,7 +82,7 @@ FUSE based client for Ceph distributed network file system %package devel Summary: Ceph headers Group: Development/Libraries -License: LGPLv2 +License: LGPL-2.0 Requires: %{name} = %{version}-%{release} Requires: librados2 = %{version} Requires: librbd1 = %{version} @@ -93,6 +94,7 @@ that use Ceph. %package radosgw Summary: Rados REST gateway Group: Development/Libraries +License: LGPL-2.0 Requires: librados2 = %{version}-%{release} %if 0%{defined suse_version} BuildRequires: libexpat-devel @@ -111,7 +113,7 @@ conjunction with any FastCGI capable web server. %package obsync Summary: synchronize data between cloud object storage providers or a local directory Group: Productivity/Networking/Other -License: LGPLv2 +License: LGPL-2.0 Requires: python, python-boto %description obsync obsync is a tool to synchronize objects between cloud object @@ -122,7 +124,7 @@ Ceph RADOS cluster, or a local directory. %package resource-agents Summary: OCF-compliant resource agents for Ceph daemons Group: System Environment/Base -License: LGPLv2 +License: LGPL-2.0 Requires: %{name} = %{version} Requires: resource-agents %description resource-agents @@ -134,7 +136,7 @@ managers such as Pacemaker. %package -n librados2 Summary: RADOS distributed object store client library Group: System Environment/Libraries -License: LGPLv2 +License: LGPL-2.0 %description -n librados2 RADOS is a reliable, autonomic distributed object storage cluster developed as part of the Ceph distributed storage system. This is a @@ -144,7 +146,7 @@ store using a simple file-like interface. %package -n librbd1 Summary: RADOS block device client library Group: System Environment/Libraries -License: LGPLv2 +License: LGPL-2.0 Requires: librados2 = %{version}-%{release} %description -n librbd1 RBD is a block device striped across multiple distributed objects in @@ -155,7 +157,7 @@ shared library allowing applications to manage these block devices. %package -n libcephfs1 Summary: Ceph distributed file system client library Group: System Environment/Libraries -License: LGPLv2 +License: LGPL-2.0 %description -n libcephfs1 Ceph is a distributed network file system designed to provide excellent performance, reliability, and scalability. This is a shared library @@ -165,7 +167,7 @@ POSIX-like interface. %package -n python-ceph Summary: Python libraries for the Ceph distributed filesystem Group: System Environment/Libraries -License: LGPLv2 +License: LGPL-2.0 Requires: librados2 = %{version}-%{release} Requires: librbd1 = %{version}-%{release} Requires: libcephfs1 = %{version}-%{release}
LGPLv2 in spec file is not correct, because some of the included packages/binaries are GPLv2. For example: src/mount/mtab.c -> package ceph, binary mount.ceph src/common/fiemap.cc -> package ceph, binary rbd Also use SPDX format (http://www.spdx.org/licenses) for the sub-package licenses. Signed-off-by: Holger Macht <hmacht@suse.de> --- ceph.spec.in | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)