Use macro to set the build flags

The -devel subpackage requires the main package which contains the license, so there's no need to pack the license also to the devel package.
This commit is contained in:
Michal Schorm 2019-07-19 16:20:42 +02:00
parent 0f4ddc6269
commit 6cca8d740f

View File

@ -3,7 +3,7 @@
Name: mariadb-connector-c Name: mariadb-connector-c
Version: 3.1.2 Version: 3.1.2
Release: 1%{?with_debug:.debug}%{?dist} Release: 2%{?with_debug:.debug}%{?dist}
Summary: The MariaDB Native Client library (C driver) Summary: The MariaDB Native Client library (C driver)
License: LGPLv2+ License: LGPLv2+
Source: https://downloads.mariadb.org/interstitial/connector-c-%{version}/mariadb-connector-c-%{version}-src.tar.gz Source: https://downloads.mariadb.org/interstitial/connector-c-%{version}/mariadb-connector-c-%{version}-src.tar.gz
@ -63,14 +63,13 @@ rm -r win zlib win-iconv examples
%build %build
%{set_build_flags}
# Override all optimization flags when making a debug build # Override all optimization flags when making a debug build
%{?with_debug: CFLAGS="$CFLAGS -O0 -g"} %{?with_debug: CFLAGS="$CFLAGS -O0 -g"}
CXXFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS"
export CFLAGS CXXFLAGS export CFLAGS CXXFLAGS
# Needed for debug build ( https://jira.mariadb.org/browse/CONC-426 ), usefull for normal build
export LDFLAGS="$LDFLAGS -fPIC"
# https://jira.mariadb.org/browse/MDEV-13836: # https://jira.mariadb.org/browse/MDEV-13836:
# The server has (used to have for ages) some magic around the port number. # The server has (used to have for ages) some magic around the port number.
# If it's 0, the default port value will use getservbyname("mysql", "tcp"), that is, whatever is written in /etc/services. # If it's 0, the default port value will use getservbyname("mysql", "tcp"), that is, whatever is written in /etc/services.
@ -172,7 +171,6 @@ popd
%dir %{_includedir}/mysql %dir %{_includedir}/mysql
%{_includedir}/mysql/* %{_includedir}/mysql/*
%license COPYING.LIB
%files config %files config
@ -206,6 +204,9 @@ popd
# Currently, one of the tests - 'ps_bugs' - is failing # Currently, one of the tests - 'ps_bugs' - is failing
%changelog %changelog
* Fri Jul 19 2019 Michal Schorm <mschorm@redhat.com> - 3.1.2-2
- Use macro to set build flags
* Fri Jul 12 2019 Michal Schorm <mschorm@redhat.com> - 3.1.2-1 * Fri Jul 12 2019 Michal Schorm <mschorm@redhat.com> - 3.1.2-1
- Rebase to 3.1 version - Rebase to 3.1 version
- Disabling the ED25519 plugin - Disabling the ED25519 plugin