From d22c0cbc3bb51d5c77dedd7e44205371b836edb7 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Fri, 27 Nov 2015 12:44:44 +0100 Subject: [PATCH] licensing: Use GPLv2+ for scripts, LGPLv2+ for libraries Version: 1-2 --- db-rpm-config.spec | 5 ++++- macros.ml | 18 ++++++++++++++++++ multilib-fix | 24 ++++++++++++++++++------ 3 files changed, 40 insertions(+), 7 deletions(-) diff --git a/db-rpm-config.spec b/db-rpm-config.spec index 86a34b6..1660107 100644 --- a/db-rpm-config.spec +++ b/db-rpm-config.spec @@ -12,7 +12,7 @@ Summary: More or less DB related rpm configuration files Name: %{?script_ns}rpm-config Version: 1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL+ Group: Development/System URL: https://github.com/devexp-db/db-rpm-config @@ -50,5 +50,8 @@ install -m 755 -p %{SOURCE0} %{buildroot}/%{ml_fix} %{macrosdir} %changelog +* Fri Nov 27 2015 Pavel Raiskup - 1-2 +- fix licensing in Sources + * Wed Nov 18 2015 Pavel Raiskup - 1-1 - initial packaging diff --git a/macros.ml b/macros.ml index 53a1bcf..8043a8d 100644 --- a/macros.ml +++ b/macros.ml @@ -1 +1,19 @@ +# Basic set of macros for 'fix-multilib' script. +# Copyright (C) 2015 Red Hat, Inc. +# Written by Pavel Raiskup +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + %@ML_MACRO_PFX@ml_fix_c_header @ML_FIX@ --buildroot "$RPM_BUILD_ROOT" diff --git a/multilib-fix b/multilib-fix index 8a76382..02e3d3d 100755 --- a/multilib-fix +++ b/multilib-fix @@ -1,13 +1,24 @@ #! /bin/sh +# Fix multilib issue for header files. +# Copyright (C) 2015 Red Hat, Inc. +# Written by Pavel Raiskup +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # Replace the multilib-unclean header file with multilib-clean stub, while the # original file is moved to unique architecture-specific location. -# -# The solution is taken from Fedora PostgreSQL RPM package. -# -# Pavel Raiskup -# -# This file is to be moved into redhat-rpm-config (or something like this). progname=$(basename "$0") @@ -22,6 +33,7 @@ opt_additional_suffix= # TODO: we could pretty easily implement other then 'cpp-header' stubs, if the # target file type allows some kind of "transparent" file inclusion. For # example shell scripts might use '. "${destdir}/${filename}_x86_64.sh'. +# The solution is taken from Fedora PostgreSQL RPM package. print_stub () { cat <