From: Marcin Krol <hawk@tld-linux.org>
Date: Tue, 20 Aug 2013 21:55:43 +0000 (+0000)
Subject: - TLDized
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=d820a80162e932bf76c5f4fad820e80fda9be2ff;p=packages%2Fmysql.git

- TLDized
---

diff --git a/mysql.spec b/mysql.spec
index 4dd93f1..cd545d5 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -78,11 +78,7 @@ URL:		http://www.mysql.com/products/community/
 BuildRequires:	bison >= 1.875
 BuildRequires:	cmake >= 2.6
 BuildRequires:	groff
-%if "%{pld_release}" == "ac"
-BuildRequires:	libstdc++4-devel >= 5:4.0
-%else
 BuildRequires:	libstdc++-devel >= 5:4.0
-%endif
 BuildRequires:	libtool
 %{?with_tcpd:BuildRequires:	libwrap-devel}
 BuildRequires:	ncurses-devel >= 4.2
@@ -516,13 +512,6 @@ cd build
 # (it defaults to first cluster but user may change it to whatever
 # cluster it wants)
 
-%if "%{pld_release}" == "ac"
-# add suffix, but allow ccache, etc in ~/.rpmmacros
-%{expand:%%define	__cc	%(echo '%__cc' | sed -e 's,-gcc,-gcc4,')}
-%{expand:%%define	__cxx	%(echo '%__cxx' | sed -e 's,-g++,-g++4,')}
-%{expand:%%define	__cpp	%(echo '%__cpp' | sed -e 's,-gcc,-gcc4,')}
-%endif
-
 # upstream has fallen down badly on symbol versioning, do it ourselves
 install -d libmysql
 cp -a %{SOURCE15} libmysql/libmysql.version
@@ -531,7 +520,7 @@ cp -a %{SOURCE15} libmysql/libmysql.version
 	-DCMAKE_BUILD_TYPE=%{!?debug:RelWithDebInfo}%{?debug:Debug} \
 	-DCMAKE_C_FLAGS_RELEASE="%{rpmcflags} -DNDEBUG -fno-omit-frame-pointer -fno-strict-aliasing" \
 	-DCMAKE_CXX_FLAGS_RELEASE="%{rpmcxxflags} -DNDEBUG -fno-omit-frame-pointer -fno-strict-aliasing" \
-	-DCOMPILATION_COMMENT="PLD/Linux Distribution MySQL RPM" \
+	-DCOMPILATION_COMMENT="TLD Linux MySQL RPM" \
 	-DCURSES_INCLUDE_PATH=/usr/include/ncurses \
 	%{!?with_systemtap:-DENABLE_DTRACE=OFF} \
 	-DFEATURE_SET="community" \
@@ -551,11 +540,7 @@ cp -a %{SOURCE15} libmysql/libmysql.version
 	-DWITH_PERFSCHEMA_STORAGE_ENGINE=1 \
 	-DWITH_PIC=ON \
 	-DWITH_READLINE=OFF \
-%if "%{pld_release}" == "ac"
-	-DWITH_SSL=%{?with_ssl:bundled}%{!?with_ssl:no} \
-%else
 	-DWITH_SSL=%{?with_ssl:system}%{!?with_ssl:no} \
-%endif
 	-DWITH_UNIT_TESTS=%{?with_tests:ON}%{!?with_tests:OFF} \
 	-DWITH_ZLIB=system \
 	..
@@ -766,7 +751,7 @@ for config in $(awk -F= '!/^#/ && /=/{print $1}' /etc/%{name}/clusters.conf); do
 	fi
 
 	if [ ! -f "$config_file" ]; then
-			echo >&2 "Lost myself! Please report this (with above errors, if any) to http://bugs.pld-linux.org/"
+			echo >&2 "Lost myself! Please report this (with above errors, if any) to TLD Linux mailing lists."
 			exit 1
 	fi
 	echo "Adding option old-passwords to config: $config_file"
@@ -805,7 +790,7 @@ for config in $(awk -F= '!/^#/ && /=/{print $1}' /etc/%{name}/clusters.conf); do
 	fi
 
 	if [ ! -f "$config_file" ]; then
-		echo >&2 "ERROR: Can't find real config file for $config! Please report this (with above errors, if any) to http://bugs.pld-linux.org/"
+		echo >&2 "ERROR: Can't find real config file for $config! Please report this (with above errors, if any) to TLD Linux mailing lists."
 		continue
 	fi
 	configs="$configs $config_file"
@@ -844,7 +829,7 @@ for config in $(awk -F= '!/^#/ && /=/{print $1}' /etc/%{name}/clusters.conf); do
 	fi
 
 	if [ ! -f "$config_file" ]; then
-		echo >&2 "ERROR: Can't find real config file for $config! Please report this (with above errors, if any) to http://bugs.pld-linux.org/"
+		echo >&2 "ERROR: Can't find real config file for $config! Please report this (with above errors, if any) to TLD Linux mailing lists."
 		continue
 	fi
 	configs="$configs $config_file"