-
Notifications
You must be signed in to change notification settings - Fork 572
Upgraded mariadb-connector-odbc to version 3.2.1 #11902
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
aninda-al
wants to merge
1
commit into
microsoft:3.0-dev
Choose a base branch
from
aninda-al:upgrade-mariadb-connector-odbc
base: 3.0-dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
33 changes: 0 additions & 33 deletions
33
SPECS-EXTENDED/mariadb-connector-odbc/libraries_include_path.patch
This file was deleted.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
SPECS-EXTENDED/mariadb-connector-odbc/mariadb-connector-odbc.signatures.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
{ | ||
"Signatures": { | ||
"mariadb-connector-odbc-3.1.11-ga-src.tar.gz": "d81a35cd9c9d2e1e732b7bd9ee704eb83775ed74bcc38d6cd5d367a3fc525a34" | ||
"mariadb-connector-odbc-3.2.1-rc-src.tar.gz": "ce2c091bc6ff87ff0edc86107222e1fef45c7f56e486d6ea357f5705bc0d71ee" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,44 +3,33 @@ Distribution: Azure Linux | |
# For deep debugging we need to build binaries with extra debug info | ||
%bcond_with debug | ||
|
||
# Disable CMake in-source builds | ||
# This is a fix for the https://fedoraproject.org/wiki/Changes/CMake_to_do_out-of-source_builds | ||
# So the beaviour will be the same also in F31 nad F32 | ||
#%%undefine __cmake_in_source_build | ||
|
||
|
||
|
||
Name: mariadb-connector-odbc | ||
Version: 3.1.11 | ||
Release: 3%{?dist} | ||
Version: 3.2.1 | ||
Release: 2.rc%{?with_debug:.debug}%{?dist}.3 | ||
Summary: The MariaDB Native Client library (ODBC driver) | ||
License: LGPLv2+ | ||
Source: https://downloads.mariadb.org/f/connector-odbc-%{version}/%{name}-%{version}-ga-src.tar.gz | ||
License: LGPL-2.1-or-later | ||
Source: https://archive.mariadb.org/connector-odbc-%{version}/%{name}-%{version}-rc-src.tar.gz | ||
Url: https://mariadb.org/en/ | ||
# Online documentation can be found at: https://mariadb.com/kb/en/library/mariadb-connector-odbc/ | ||
|
||
BuildRequires: cmake unixODBC-devel gcc-c++ | ||
BuildRequires: mariadb-connector-c-devel >= 3.0.6 | ||
|
||
Patch1: libraries_include_path.patch | ||
BuildRequires: mariadb-connector-c-devel >= 3.3.8 | ||
|
||
%description | ||
MariaDB Connector/ODBC is a standardized, LGPL licensed database driver using | ||
the industry standard Open Database Connectivity (ODBC) API. It supports ODBC | ||
Standard 3.5, can be used as a drop-in replacement for MySQL Connector/ODBC, | ||
and it supports both Unicode and ANSI modes. | ||
|
||
|
||
|
||
%prep | ||
%setup -q -n %{name}-%{version}-ga-src | ||
%patch 1 -p1 | ||
%setup -q -n %{name}-%{version}-rc-src | ||
|
||
%build | ||
|
||
%cmake . \ | ||
%cmake \ | ||
-DCMAKE_BUILD_TYPE="%{?with_debug:Debug}%{!?with_debug:RelWithDebInfo}" \ | ||
-DMARIADB_LINK_DYNAMIC="%{_libdir}/libmariadb.so" \ | ||
\ | ||
-DINSTALL_LAYOUT=RPM \ | ||
-DINSTALL_LIBDIR="%{_lib}" \ | ||
-DINSTALL_LIB_SUFFIX="%{_lib}" \ | ||
|
@@ -56,32 +45,83 @@ FCFLAGS="$FCFLAGS -O0 -g"; export FCFLAGS | |
%endif | ||
|
||
#cmake -B %_vpath_builddir -LAH | ||
|
||
%cmake_build | ||
|
||
|
||
|
||
%install | ||
%cmake_install | ||
|
||
|
||
|
||
%files | ||
%license COPYING | ||
%doc README | ||
|
||
# This is unixODBC plugin. It resides directly in %%{_libdir} to be consistent with the rest of unixODBC plugins. Since it is plugin, it doesn´t need to be versioned. | ||
%{_libdir}/libmaodbc.so | ||
|
||
# Example configuration file for UnixODBC | ||
%{_pkgdocdir}/maodbc.ini | ||
|
||
# Pkgconfig | ||
%{_libdir}/pkgconfig/libmaodbc.pc | ||
|
||
%changelog | ||
* Thu Oct 14 2021 Pawel Winogrodzki <[email protected]> - 3.1.11-3 | ||
- Converting the 'Release' tag to the '[number].[distribution]' format. | ||
* Tue Jan 14 2025 Aninda Pradhan <[email protected]> - 3.2.1-2.rc.3 | ||
- Initial Azure Linux import from Fedora 41 (license: MIT) | ||
- License Verified | ||
|
||
* Thu Jul 18 2024 Fedora Release Engineering <[email protected]> - 3.2.1-1.rc.3 | ||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild | ||
|
||
* Thu Jan 25 2024 Fedora Release Engineering <[email protected]> - 3.2.1-1.rc.2 | ||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild | ||
|
||
* Sun Jan 21 2024 Fedora Release Engineering <[email protected]> - 3.2.1-1.rc.1 | ||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild | ||
|
||
* Sun Jan 07 2024 Michal Schorm <[email protected]> - 3.2.1-1.rc | ||
- Rebase to 3.2.1 RC | ||
|
||
* Sun Jan 07 2024 Michal Schorm <[email protected]> - 3.1.20-2 | ||
- Fix minimal required version of mariadb-connector-c as per: | ||
https://mariadb.com/kb/en/mariadb-connector-odbc-3-1-20-release-notes/ | ||
|
||
* Sun Jan 07 2024 Michal Schorm <[email protected]> - 3.1.20-1 | ||
- Rebase to 3.1.20 | ||
|
||
* Wed Jul 26 2023 Michal Schorm <[email protected]> - 3.1.19-1 | ||
- Rebase to 3.1.19 | ||
|
||
* Thu Jul 20 2023 Fedora Release Engineering <[email protected]> - 3.1.18-2 | ||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild | ||
|
||
* Wed Apr 19 2023 Michal Schorm <[email protected]> - 3.1.18-1 | ||
- Rebase to 3.1.18 | ||
|
||
* Thu Jan 19 2023 Fedora Release Engineering <[email protected]> - 3.1.15-3 | ||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild | ||
|
||
* Thu Jul 21 2022 Fedora Release Engineering <[email protected]> - 3.1.15-2 | ||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild | ||
|
||
* Fri Feb 18 2022 Michal Schorm <[email protected]> - 3.1.15-1 | ||
- Rebase to 3.1.15 | ||
|
||
* Fri Feb 18 2022 Michal Schorm <[email protected]> - 3.1.14-1 | ||
- Rebase to 3.1.14 | ||
|
||
* Thu Jan 20 2022 Fedora Release Engineering <[email protected]> - 3.1.13-3 | ||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild | ||
|
||
* Thu Jul 22 2021 Fedora Release Engineering <[email protected]> - 3.1.13-2 | ||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild | ||
|
||
* Wed Jun 09 2021 Michal Schorm <[email protected]> - 3.1.13-1 | ||
- Rebase to 3.1.13 | ||
|
||
* Thu Apr 22 2021 Michal Schorm <[email protected]> - 3.1.12-1 | ||
- Rebase to 3.1.12 | ||
|
||
* Mon Jun 28 2021 Thomas Crain <[email protected]> - 3.1.11-2 | ||
- Initial CBL-Mariner import from Fedora 33 (license: MIT). | ||
- Turn in-source builds back on to fix build break regarding cmake macro compatibility | ||
* Tue Jan 26 2021 Fedora Release Engineering <[email protected]> - 3.1.11-2 | ||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild | ||
|
||
* Mon Dec 14 2020 Lukas Javorsky <[email protected]> - 3.1.11-1 | ||
- Rebase to 3.1.11 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
where did we get this format? Please fix it.