SPECS (DEVEL): mysql.spec - build with system openssl - misunderst...

[glen]

Author: glen                         Date: Sun Oct 22 18:55:39 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- build with system openssl
- misunderstood usage of --with-plugins (denotes plugins compiled into mysqld)
- check files cleanup

---- Files affected:
SPECS:
   mysql.spec (1.324.2.5 -> 1.324.2.6) 

---- Diffs:

================================================================
Index: SPECS/mysql.spec
diff -u SPECS/mysql.spec:1.324.2.5 SPECS/mysql.spec:1.324.2.6
--- SPECS/mysql.spec:1.324.2.5	Sat Oct 21 14:41:23 2006
+++ SPECS/mysql.spec	Sun Oct 22 20:55:33 2006
@@ -4,16 +4,12 @@
 # - C(XX)FLAGS for innodb subdirs are overriden by ./configure!
 # - http://bugs.mysql.com/bug.php?id=16470
 # - innodb, dbd are dynamic (= as plugins) ?
-# - warning: Installed (but unpackaged) file(s) found:
-#   /usr/bin/benchmark
-#   /usr/bin/mysql_client_test
-#   /usr/bin/test
-#   /usr/bin/testsuite
-#   /usr/share/mysql/mi_test_all
-#   /usr/share/mysql/mi_test_all.res
 # - berkeley is still compiled in regardless of --without conf arg
 # - missing have_archive, have_merge
 # - is plugin_dir lib64 safe?
+#   /usr/lib/mysql/ha_blackhole.a
+#   /usr/lib/mysql/ha_blackhole.la
+#   /usr/lib/mysql/ha_blackhole.so.0.0.0
 #
 # Conditional build:
 %bcond_with	bdb		# Berkeley DB support
@@ -34,7 +30,7 @@
 Summary(zh_CN):	MySQLĘýžÝżâˇţÎńĆ÷
 Name:		mysql
 Version:	5.1.11
-Release:	0.3
+Release:	0.5
 License:	GPL + MySQL FLOSS Exception
 Group:		Applications/Databases
 Source0:	http://mysql.dataphone.se/Downloads/MySQL-5.1/%{name}-%{version}-beta.tar.gz
@@ -449,7 +445,7 @@
 	--with%{!?with_bdb:out}-berkeley-db \
 	--with%{!?with_innodb:out}-innodb \
 	--with%{!?with_raid:out}-raid \
-	--with%{!?with_ssl:out}-ssl \
+	--with%{!?with_ssl:out}-ssl=/usr \
 	--with%{!?with_tcpd:out}-libwrap \
 	%{?with_big_tables:--with-big-tables} \
 	--with-comment="PLD Linux Distribution MySQL RPM" \
@@ -463,7 +459,6 @@
 	--with-named-thread-libs="-lpthread" \
 	--with-unix-socket-path=/var/lib/mysql/mysql.sock \
 	--with-archive-storage-engine \
-	--with-plugins=berkeley,blackhole,csv,federated,ftexample,heap,innobase,myisam,myisammrg,ndbcluster,partition \
 	--with-fast-mutexes \
 	--with-vio \
 	--with-ndbcluster \
@@ -566,6 +561,11 @@
 rm $RPM_BUILD_ROOT%{_mandir}/man1/safe_mysqld*
 rm $RPM_BUILD_ROOT%{_mandir}/man1/mysqlman.1*
 
+# we don't package those (we have no -test or -testsuite pkg) and some of them just segfault
+rm $RPM_BUILD_ROOT%{_bindir}/mysql_client_test
+rm $RPM_BUILD_ROOT%{_datadir}/mysql/mi_test_all
+rm $RPM_BUILD_ROOT%{_datadir}/mysql/mi_test_all.res
+
 # in %doc
 rm $RPM_BUILD_ROOT%{_datadir}/%{name}/*.{ini,cnf}
 
@@ -849,6 +849,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.324.2.6  2006/10/22 18:55:33  glen
+- build with system openssl
+- misunderstood usage of --with-plugins (denotes plugins compiled into mysqld)
+- check files cleanup
+
 Revision 1.324.2.5  2006/10/21 12:41:23  glen
 - added mysqlslap to -client package
 - cleanups, pass --with-plugins
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mysql.spec?r1=1.324.2.5&r2=1.324.2.6&f=u