Skip to content

Commit

Permalink
[OSS ONLY] Update spec file to use SPDX short name for license and in…
Browse files Browse the repository at this point in the history
…clude same (#285)

Compared the included license file with SPDX and confirmed match. See https://spdx.org/licenses/PostgreSQL.html.

Update spec file to include proper license string and add _trivial and _buildid macros to allow for RPM iteration.

The current license in the spec file is PostgreSQL Global Development Group which is not a valid SPDX license and was flagged by our automation as invalid for inclusion in Amazon Linux.

The proper upstream SPDX license is changed to per https://spdx.org/licenses/PostgreSQL.html.

Signed-off-by: Rishabh Tanwar <[email protected]>
Co-authored-by: Rishabh Tanwar <[email protected]>
  • Loading branch information
rishabhtanwar29 and ritanwar authored Jan 10, 2024
1 parent 50fba00 commit f151190
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
9 changes: 7 additions & 2 deletions BabelfishDump.spec
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,16 @@
# https://fedoraproject.org/wiki/Packaging:Guidelines#Packaging_of_Additional_RPM_Macros
%global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)

%define _trivial .0
%define _buildid .1

%undefine _missing_build_ids_terminate_build

Name: BabelfishDump
Summary: Postgresql dump utilities modified for Babelfish
Version: 15.5
Release: 1%{?dist}
License: PostgreSQL Global Development Group
Release: 1%{?dist}%{?_trivial}%{?_buildid}
License: PostgreSQL
Url: https://github.com/babelfish-for-postgresql/postgresql_modified_for_babelfish

BuildRequires: make
Expand Down Expand Up @@ -134,6 +137,8 @@ LD_LIBRARY_PATH=%{_builddir}/%{name}/src/interfaces/libpq $RPM_BUILD_ROOT/usr/bi

# FILES sections.
%files
%doc COPYRIGHT
%doc LICENSE.PostgreSQL
%{_bindir}/bbf_dump
%{_bindir}/bbf_dumpall

Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ tarball: rpm-clean
cp -p GNUmakefile* $(PACKAGE_NAME)
cp -p Makefile $(PACKAGE_NAME)
cp -rp config src $(PACKAGE_NAME)
cp COPYRIGHT LICENSE.PostgreSQL $(PACKAGE_NAME)

tar -czf $(SOURCE_TARBALL) $(PACKAGE_NAME)/*

Expand Down

0 comments on commit f151190

Please sign in to comment.