From 9c1b69700c1ede718aa30ddf8b62d46c5b528584 Mon Sep 17 00:00:00 2001 From: Michal Schorm Date: Mon, 11 Dec 2017 12:55:15 +0100 Subject: [PATCH] Temporary fix for #1523875 removed, bug in Annobin fixed --- mariadb.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mariadb.spec b/mariadb.spec index 3c58c95..980cca3 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -137,7 +137,7 @@ Name: mariadb Version: %{compatver}.%{bugfixver} -Release: 1%{?with_debug:.debug}%{?dist} +Release: 2%{?with_debug:.debug}%{?dist} Epoch: 3 Summary: A community developed branch of MySQL @@ -789,9 +789,6 @@ CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O1|g" ` CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O3|g" ` %endif -# Temporary fix for rhbz#1523875 -CFLAGS=`echo $CFLAGS| sed -e "s|-specs=/usr/lib/rpm/redhat/redhat-annobin-cc1||g" ` - CXXFLAGS="$CFLAGS" export CFLAGS CXXFLAGS @@ -1609,10 +1606,15 @@ fi %endif %changelog +* Mon Dec 11 2017 Michal Schorm - 3:10.2.11-2 +- Temporary fix for #1523875 removed, bug in Annobin fixed + Resolves: #1523875 + * Sat Dec 09 2017 Michal Schorm - 3:10.2.11-1 - Rebase to 10.2.11 - Temporary fix for https://jira.mariadb.org/browse/MDEV-14537 introduced - Temporary fix for #1523875 intoruced + Related: #1523875 * Wed Dec 06 2017 Michal Schorm - 3:10.2.10-2 - Fix PID file location