From 6cca8d740f33f985af85b2fa81301129fabf956e Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Jul 19 2019 14:23:25 +0000 Subject: 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. --- diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index a0ccdc6..993357e 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -3,7 +3,7 @@ Name: mariadb-connector-c Version: 3.1.2 -Release: 1%{?with_debug:.debug}%{?dist} +Release: 2%{?with_debug:.debug}%{?dist} Summary: The MariaDB Native Client library (C driver) License: LGPLv2+ 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 +%{set_build_flags} + # Override all optimization flags when making a debug build %{?with_debug: CFLAGS="$CFLAGS -O0 -g"} CXXFLAGS="$CFLAGS" 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: # 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. @@ -172,7 +171,6 @@ popd %dir %{_includedir}/mysql %{_includedir}/mysql/* -%license COPYING.LIB %files config @@ -206,6 +204,9 @@ popd # Currently, one of the tests - 'ps_bugs' - is failing %changelog +* Fri Jul 19 2019 Michal Schorm - 3.1.2-2 +- Use macro to set build flags + * Fri Jul 12 2019 Michal Schorm - 3.1.2-1 - Rebase to 3.1 version - Disabling the ED25519 plugin