packages: mysql/mysql.spec - builds on ac-amd64: RPMS/mysql-5.5.8-0.1.amd64...

[glen]

Author: glen                         Date: Mon Dec 27 19:12:30 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- builds on ac-amd64: RPMS/mysql-5.5.8-0.1.amd64.rpm

---- Files affected:
packages/mysql:
   mysql.spec (1.505 -> 1.506) 

---- Diffs:

================================================================
Index: packages/mysql/mysql.spec
diff -u packages/mysql/mysql.spec:1.505 packages/mysql/mysql.spec:1.506
--- packages/mysql/mysql.spec:1.505	Thu Dec 16 15:20:43 2010
+++ packages/mysql/mysql.spec	Mon Dec 27 20:12:24 2010
@@ -26,6 +26,13 @@
 %bcond_with	tests		# FIXME: don't run correctly
 %bcond_with	ndb		# NDB is now a separate product, this here is broken, so disable it
 
+%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
+
 %include	/usr/lib/rpm/macros.perl
 Summary:	MySQL: a very fast and reliable SQL database engine
 Summary(de.UTF-8):	MySQL: ist eine SQL-Datenbank
@@ -97,6 +104,10 @@
 BuildRequires:	rpmbuild(macros) >= 1.577
 BuildRequires:	sed >= 4.0
 BuildRequires:	zlib-devel
+# gcc4 might be installed, but not current __cc
+%if "%(echo %{cxx_version} | cut -d. -f1,2)" < "4.0"
+BuildRequires:	__cxx >= 4.0
+%endif
 Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
@@ -537,6 +548,14 @@
 # NOTE that /var/lib/mysql/mysql.sock is symlink to real sock file
 # (it defaults to first cluster but user may change it to whatever
 # cluster it wants)
+
+%if "%{pld_release}" == "ac"
+# this needs to be redefined for ./repackage.sh to work
+%{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
+
 %cmake \
 	-DCMAKE_C_FLAGS_RELEASE="%{rpmcflags} -DNDEBUG" \
 	-DCMAKE_CXX_FLAGS_RELEASE="%{rpmcxxflags} -DNDEBUG" \
@@ -549,7 +568,7 @@
 	-DWITH_ZLIB=system \
 	-DWITH_COMMENT="PLD Linux Distribution MySQL RPM" \
 	-DWITH_LIBWRAP=%{?with_tcpd:ON}%{?!with_tcpd:OFF} \
-	-DCURSES_INCLUDE_PATH=%{_includedir}/ncurses \
+	-DCURSES_INCLUDE_PATH=/usr/include/ncurses \
 	-DCMAKE_INSTALl_PREFIX="" \
 	-DMYSQL_UNIX_ADDR=/var/lib/%{name}/%{name}.sock \
 	-DINSTALL_INCLUDEDIR=%{_includedir}/%{name} \
@@ -1101,6 +1120,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.506  2010/12/27 19:12:24  glen
+- builds on ac-amd64: RPMS/mysql-5.5.8-0.1.amd64.rpm
+
 Revision 1.505  2010/12/16 14:20:43  glen
 - BR cmake 2.6
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.spec?r1=1.505&r2=1.506&f=u