From 72343105195fb1289b51e97cd8db9f8703d8b87e Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Mon, 25 Apr 2022 16:05:22 -0400 Subject: [PATCH] Move licensing to files instead of rpm description for vtbuffer --- confluent_vtbufferd/buildrpm | 2 +- .../confluent_vtbufferd.spec.tmpl | 21 +++++-------------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/confluent_vtbufferd/buildrpm b/confluent_vtbufferd/buildrpm index 333f6acb..8312c348 100755 --- a/confluent_vtbufferd/buildrpm +++ b/confluent_vtbufferd/buildrpm @@ -4,7 +4,7 @@ if [ "$NUMCOMMITS" != "$VERSION" ]; then VERSION=$VERSION.dev$NUMCOMMITS.g`git describe|cut -d- -f 3` fi mkdir -p dist/confluent_vtbufferd-$VERSION -cp *.c *.h Makefile dist/confluent_vtbufferd-$VERSION +cp ../LICENSE *.c *.h Makefile dist/confluent_vtbufferd-$VERSION cd dist tar czf confluent_vtbufferd-$VERSION.tar.gz confluent_vtbufferd-$VERSION cd - diff --git a/confluent_vtbufferd/confluent_vtbufferd.spec.tmpl b/confluent_vtbufferd/confluent_vtbufferd.spec.tmpl index 24e0681e..dcf022b8 100644 --- a/confluent_vtbufferd/confluent_vtbufferd.spec.tmpl +++ b/confluent_vtbufferd/confluent_vtbufferd.spec.tmpl @@ -17,21 +17,6 @@ Url: https://github.com/lenovo/confluent/ %description Service for managing in-memory VT emulation for confluent. -Contains third party open source code: - -Copyright (c) 2017 Rob King -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the copyright holder nor the - names of contributors may be used to endorse or promote products - derived from this software without specific prior written permission. %prep %setup -n %{name}-%{version} -n %{name}-%{version} @@ -40,8 +25,12 @@ modification, are permitted provided that the following conditions are met: make %install -mkdir -p $RPM_BUILD_ROOT/opt/confluent/bin +mkdir -p $RPM_BUILD_ROOT/opt/confluent/bin $RPM_BUILD_ROOT/opt/confluent/share/licenses/vtbufferd cp vtbufferd $RPM_BUILD_ROOT/opt/confluent/bin/ +cp COPYING.tmt $RPM_BUILD_ROOT/opt/confluent/share/licenses/vtbufferd +cp LICENSE $RPM_BUILD_ROOT/opt/confluent/share/licenses/vtbufferd %files /opt/confluent/bin/vtbufferd +%license /opt/confluent/share/licenses/vtbufferd/COPYING.tmt +%license /opt/confluent/share/licenses/vtbufferd/LICENSE