packages: mysql/mysql.spec - resurrect more options, bconds, post-fix mysql...

[arekm]

Author: arekm                        Date: Wed Dec 15 21:37:42 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- resurrect more options, bconds, post-fix mysql_config

---- Files affected:
packages/mysql:
   mysql.spec (1.500 -> 1.501) 

---- Diffs:

================================================================
Index: packages/mysql/mysql.spec
diff -u packages/mysql/mysql.spec:1.500 packages/mysql/mysql.spec:1.501
--- packages/mysql/mysql.spec:1.500	Wed Dec 15 22:08:15 2010
+++ packages/mysql/mysql.spec	Wed Dec 15 22:37:37 2010
@@ -535,14 +535,20 @@
 install -d build
 cd build
 %{cmake} \
+	-DCMAKE_C_FLAGS_RELEASE="%{rpmcflags} -DNDEBUG" \
+	-DCMAKE_CXX_FLAGS_RELEASE="%{rpmcxxflags} -DNDEBUG" \
+	-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
 	%{?debug:-DWITH_DEBUG=ON} \
 	-DWITH_FAST_MUTEXES=ON \
 	-DWITH_LIBEDIT=OFF \
 	-DWITH_READLINE=ON \
-	-DWITH_SSL=yes \
+	-DWITH_SSL=%{?with_ssl:yes}%{?!with_ssl:no} \
 	-DWITH_ZLIB=system \
+	-DWITH_COMMENT="PLD Linux Distribution MySQL RPM" \
+	-DWITH_LIBWRAP=%{?with_tcpd:ON}%{?!with_tcpd:OFF} \
 	-DCURSES_INCLUDE_PATH=%{_includedir}/ncurses \
 	-DCMAKE_INSTALl_PREFIX="" \
+	-DMYSQL_UNIX_ADDR=/var/lib/mysql/mysql.sock \
 	-DINSTALL_INCLUDEDIR=%{_includedir}/mysql \
 	-DINSTALL_BINDIR=%{_bindir} \
 	-DINSTALL_DOCDIR=%{_docdir}/%{name}-%{version} \
@@ -608,8 +614,7 @@
 install %{SOURCE12} $RPM_BUILD_ROOT/etc/sysconfig/mysql-ndb-cpc
 %endif
 
-#mv -f $RPM_BUILD_ROOT%{_libdir}/mysql/lib* $RPM_BUILD_ROOT%{_libdir}
-#sed -i -e 's,%{_libdir}/mysql,%{_libdir},' $RPM_BUILD_ROOT{%{_libdir}/libmysqlclient{,_r}.la,%{_bindir}/mysql_config}
+sed -i -e 's,/usr//usr,%{_prefix,g' $RPM_BUILD_ROOT%{_bindir}/mysql_config
 sed -i -e '/libs/s/$ldflags//' $RPM_BUILD_ROOT%{_bindir}/mysql_config
 
 # remove known unpackaged files
@@ -1089,6 +1094,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.501  2010/12/15 21:37:37  arekm
+- resurrect more options, bconds, post-fix mysql_config
+
 Revision 1.500  2010/12/15 21:08:15  arekm
 - checked some patches
 
================================================================

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