Compare commits

...

No commits in common. "c9-beta" and "c8s" have entirely different histories.
c9-beta ... c8s

6 changed files with 31 additions and 82 deletions

4
.gitignore vendored
View File

@ -1 +1,3 @@
SOURCES/mariadb-connector-odbc-3.1.12-src.tar.gz
/*.tar.gz
/*.rpm
/*/*

View File

@ -1 +0,0 @@
284458f152523308e565f90673b5a3ed5206c101 SOURCES/mariadb-connector-odbc-3.1.12-src.tar.gz

6
gating.yaml Normal file
View File

@ -0,0 +1,6 @@
--- !Policy
product_versions:
- rhel-8
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}

View File

@ -1,16 +1,9 @@
# 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.12
Release: 3%{?with_debug:.debug}%{?dist}
Release: 1%{?with_debug:.debug}%{?dist}
Summary: The MariaDB Native Client library (ODBC driver)
License: LGPLv2+
Source: https://downloads.mariadb.org/f/connector-odbc-%{version}/%{name}-%{version}-src.tar.gz
@ -28,44 +21,35 @@ 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}-src
%patch1 -p1
%build
%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}" \
-DINSTALL_DOCDIR="%{_defaultdocdir}/%{name}" \
-DINSTALL_LICENSEDIR="%{_defaultlicensedir}/%{name}" \
%{set_build_flags}
# Override all optimization flags when making a debug build
%if %{with debug}
CFLAGS="$CFLAGS -O0 -g"; export CFLAGS
CXXFLAGS="$CXXFLAGS -O0 -g"; export CXXFLAGS
FFLAGS="$FFLAGS -O0 -g"; export FFLAGS
FCFLAGS="$FCFLAGS -O0 -g"; export FCFLAGS
%endif
#cmake -B %_vpath_builddir -LAH
%cmake_build
%{?with_debug: CFLAGS="$CFLAGS -O0 -g"}
CXXFLAGS="$CFLAGS"
export CFLAGS CXXFLAGS
%cmake -DMARIADB_LINK_DYNAMIC="%{_libdir}/libmariadb.so" \
-DBUILD_SHARED_LIBS="ON" \
-DCMAKE_BUILD_TYPE="%{?with_debug:Debug}%{!?with_debug:RelWithDebInfo}" \
-DCMAKE_INSTALL_PREFIX="%{_usr}" \
-DINCLUDE_INSTALL_DIR="%{_includedir}" \
-DINSTALL_LIBDIR="%{_lib}" \
-DSHARE_INSTALL_PREFIX="%{_datadir}" \
-DSYSCONF_INSTALL_DIR="%{_sysconfdir}" \
-DINSTALL_DOCDIR="%{_defaultdocdir}/%{name}" \
-DINSTALL_LICENSEDIR="%{_defaultlicensedir}/%{name}" \
.
#cmake -LAH
cmake -L .
%install
%cmake_install
%make_install
%files
%license COPYING
@ -77,41 +61,13 @@ FCFLAGS="$FCFLAGS -O0 -g"; export FCFLAGS
%changelog
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.1.12-3
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 3.1.12-2
- Rebuilt for RHEL 9 BETA for openssl 3.0
Related: rhbz#1971065
* Thu Apr 22 2021 Michal Schorm <mschorm@redhat.com> - 3.1.12-1
- Rebase to 3.1.12
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.1.11-3
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Dec 14 2020 Lukas Javorsky <ljavorsk@redhat.com> - 3.1.11-1
- Rebase to 3.1.11
- Add updates for paths in libraries_include_path.patch
* Thu Aug 06 2020 Michal Schorm <mschorm@redhat.com> - 3.1.9-4
- Force the CMake change regarding the in-source builds also to F31 and F32
- %%cmake macro covers the %%{set_build_flags}, so they are not needed
That also means, the debug build changes to the build flags must be done AFTER the
%%cmake macro was used.
- %%cmake macro also covers several other options which redudndant specification I removed in this commit
- Default to %%cmake commands instead of %%make commands
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.9-3
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
- Patch add_docs_license_dir_option upstreamed
* Thu Jul 02 2020 Lukas Javorsky <ljavorsk@redhat.com> - 3.1.9-1
- Rebase to 3.1.9
@ -120,18 +76,12 @@ FCFLAGS="$FCFLAGS -O0 -g"; export FCFLAGS
* Thu Apr 09 2020 Michal Schorm <mschorm@redhat.com> - 3.1.7-1
- Rebase to 3.1.7
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jan 23 2020 Lukas Javorsky <ljavorsk@redhat.com> - 3.1.6-1
- Rebase to 3.1.6
* Fri Nov 15 2019 Lukas Javorsky <ljavorsk@redhat.com> - 3.1.5-1
- Rebase to 3.1.5
* Tue Nov 12 2019 Michal Schorm <mschorm@redhat.com> - 3.1.4-2
- Rebuild on top of new mariadb-connector-c
* Mon Nov 04 2019 Michal Schorm <mschorm@redhat.com> - 3.1.4-1
- Rebase to 3.1.4
@ -142,9 +92,6 @@ FCFLAGS="$FCFLAGS -O0 -g"; export FCFLAGS
- Rebase to 3.1.2
- Patch2 upstreamed
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Jul 19 2019 Michal Schorm <mschorm@redhat.com> - 3.1.1-4
- Use macro for setting the compiler flags
@ -152,25 +99,19 @@ FCFLAGS="$FCFLAGS -O0 -g"; export FCFLAGS
- Added debug build switch
- Added patch2: configurable doc and license dirs paths
* Wed Jun 05 2019 Michal Schorm <mschorm@redhat.com> - 3.1.1-2
- Patch solution found
* Tue Jun 04 2019 Michal Schorm <mschorm@redhat.com> - 3.1.1-1
- Rebase to 3.1.1
* Tue Jun 04 2019 Michal Schorm <mschorm@redhat.com> - 3.0.9-1
- Rebase to 3.0.9
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Wed Jan 23 2019 Björn Esser <besser82@fedoraproject.org> - 3.0.8-2
- Append curdir to CMake invokation. (#1668512)
* Sun Jan 06 2019 Michal Schorm <mschorm@redhat.com> - 3.0.8-1
- Rebase to 3.0.8
* Tue Nov 20 2018 Michal Schorm <mschorm@redhat.com> - 3.0.7-1
* Mon Dec 10 2018 Michal Schorm <mschorm@redhat.com> - 3.0.7-1
- Rebase to 3.0.7
* Fri Aug 03 2018 Michal Schorm <mschorm@redhat.com> - 3.0.6-1

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (mariadb-connector-odbc-3.1.12-src.tar.gz) = 9723555c598c3ec77c41a617d9960c8d0fb9ee9d0b70e44b44f55f8842a5966b50ed6c04e8a80d252330b2cd96bdac4e0403100141e827c23af72ed58f747ffb