Skip to content

Commit 83a5d24

Browse files
committed
BUG#37868219: RPM packages have incorrect copyright year in their metadata
BUG#37642447: The license type is missing from RPM package This patch fixes the issue where wrong year as well as license type is being shown by the RPM packages of Connector/Python when being inspected. Change-Id: Ia3e5a72bac063e333eef207ca272d7d1a3c705ec
1 parent 7179239 commit 83a5d24

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

CHANGES.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ v9.4.0
1414
- WL#16966: Upgrade Python lz4 version
1515
- WL#16963: Update the OpenTelemetry version
1616
- WL#16962: Update the Python Protobuf version
17+
- BUG#37868219: RPM packages have incorrect copyright year in their metadata
1718
- BUG#37820231: Text based django ORM filters doesn't work with Connector/Python
1819
- BUG#37806057: Rename extra option (when installing wheel package) to install webauthn functionality dependencies
20+
- BUG#37642447: The license type is missing from RPM package
1921
- BUG#37627508: mysql/connector python fetchmany() has an off by one bug when argument given as 1
2022
- BUG#37047789: Python connector does not support Django enum
2123
- BUG#36452514: Missing version info resources

mysql-connector-python/cpydist/data/rpm/mysql-connector-python.spec

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
%undefine _package_note_file
3232
%define _build_id_links none
33+
%define current_year %(date +%Y)
3334

3435
%if 0%{?rhel} == 8
3536
%{!?__python3: %global __python3 /usr/bin/python3.9}
@@ -70,7 +71,7 @@ Summary: Standardized MySQL database driver for Python
7071
Name: mysql-connector-python%{?product_suffix}
7172
Version: %{version}
7273
Release: 1%{?version_extra:.%{version_extra}}%{?byte_code_only:.1}%{?dist}
73-
License: Copyright (c) 2015, 2024, Oracle and/or its affiliates. Under %{?license_type} license as shown in the Description field.
74+
License: Copyright (c) 2015, %{current_year}, Oracle and/or its affiliates. Under %{?lic_type} license as shown in the Description field.
7475
URL: https://dev.mysql.com/downloads/connector/python/
7576
Source0: https://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python%{?product_suffix}-%{version}-src.tar.gz
7677

@@ -176,6 +177,10 @@ cd mysql-connector-python
176177
%{python3_sitearch}/_mysql_connector.cpython*.so
177178
178179
%changelog
180+
* Fri May 30 2025 Souma Kanti Ghosh <[email protected]> - 9.4.0-1
181+
- Fixed missing license type in license metadata
182+
- Added current year macro to be used in license metadata
183+
179184
* Mon Mar 17 2025 Souma Kanti Ghosh <[email protected]> - 9.3.0-1
180185
- Updated for 9.3.0
181186

mysqlx-connector-python/cpydist/data/rpm/mysql-connector-python.spec

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
%global wants_py_dnspython_version 2.6.1
3030

3131
%undefine _package_note_file
32+
%define current_year %(date +%Y)
3233

3334
%if 0%{?rhel} == 8
3435
%{!?__python3: %global __python3 /usr/bin/python3.9}
@@ -66,7 +67,7 @@ Summary: Standardized MySQL database driver for Python
6667
Name: mysqlx-connector-python%{?product_suffix}
6768
Version: %{version}
6869
Release: 1%{?version_extra:.%{version_extra}}%{?byte_code_only:.1}%{?dist}
69-
License: Copyright (c) 2015, 2024, Oracle and/or its affiliates. Under %{?license_type} license as shown in the Description field.
70+
License: Copyright (c) 2015, %{current_year}, Oracle and/or its affiliates. Under %{?lic_type} license as shown in the Description field.
7071
URL: https://dev.mysql.com/downloads/connector/python/
7172
Source0: https://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python%{?product_suffix}-%{version}-src.tar.gz
7273

@@ -174,6 +175,10 @@ sed -i -e '/protobuf/d' %{buildroot}%{python3_sitearch}/mysqlx_connector_python-
174175
%{python3_sitearch}/_mysqlxpb.cpython*.so
175176
176177
%changelog
178+
* Fri May 30 2025 Souma Kanti Ghosh <[email protected]> - 9.4.0-1
179+
- Fixed missing license type in license metadata
180+
- Added current year macro to be used in license metadata
181+
177182
* Mon Mar 17 2025 Souma Kanti Ghosh <[email protected]> - 9.3.0-1
178183
- Updated for 9.3.0
179184

0 commit comments

Comments
 (0)