Removing client-side specific libraries and sub-packages devel, embeded and embeded-devel

2 files changed, 16 insertions, 62 deletions

diff --git a/mysql55/meta-mysql.spec b/mysql55/meta-mysql.spec
index f82ffa1..335cb2f 100644
--- a/mysql55/meta-mysql.spec
+++ b/mysql55/meta-mysql.spec
@@ -11,6 +11,7 @@ Group: Applications/File
 Requires: scl-utils
 Requires: %{scl_prefix}mysql
 BuildRequires: scl-utils-build
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 This is the main package for %scl Software Collection.
diff --git a/mysql55/mysql.spec b/mysql55/mysql.spec
index 203e455..895d3b6 100644
--- a/mysql55/mysql.spec
+++ b/mysql55/mysql.spec
@@ -121,42 +121,6 @@ client/server implementation consisting of a server daemon (mysqld)
 and many different client programs and libraries. This package contains
 the MySQL server and some accompanying files and directories.
 
-%package devel
-
-Summary: Files for development of MySQL applications
-Group: Applications/Databases
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: %{name}-libs%{?_isa} = %{version}-%{release}
-Requires: openssl-devel%{?_isa}
-Conflicts: MySQL-devel
-
-%description devel
-MySQL is a multi-user, multi-threaded SQL database server. This
-package contains the libraries and header files that are needed for
-developing MySQL client applications.
-
-%package embedded
-
-Summary: MySQL as an embeddable library
-Group: Applications/Databases
-
-%description embedded
-MySQL is a multi-user, multi-threaded SQL database server. This
-package contains a version of the MySQL server that can be embedded
-into a client application instead of running as a separate process.
-
-%package embedded-devel
-
-Summary: Development files for MySQL as an embeddable library
-Group: Applications/Databases
-Requires: %{name}-embedded%{?_isa} = %{version}-%{release}
-Requires: %{name}-devel%{?_isa} = %{version}-%{release}
-
-%description embedded-devel
-MySQL is a multi-user, multi-threaded SQL database server. This
-package contains files needed for developing and testing with
-the embedded version of the MySQL server.
-
 %package bench
 
 Summary: MySQL benchmark scripts and data
@@ -290,11 +254,6 @@ rm -f sql_binlog.cc.o rpl_utility.cc.o
 gcc $CFLAGS $LDFLAGS -shared -Wl,-soname,libmysqld.so.0 -o libmysqld.so.0.0.1 \
 	*.o ../../probes_mysql.o \
 	-lpthread -laio -lcrypt -lssl -lcrypto -lz -lrt -lstdc++ -ldl -lm -lc
-# this is to check that we built a complete library
-cp %{SOURCE9} .
-ln -s libmysqld.so.0.0.1 libmysqld.so.0
-gcc -I../../include $CFLAGS mysql-embedded-check.c libmysqld.so.0
-LD_LIBRARY_PATH=. ldd ./a.out
 cd ../..
 
 %if %runselftest
@@ -462,6 +421,21 @@ cp %{SOURCE7} README.mysql-license
 # install the list of skipped tests to be available for user runs
 install -m 0644 mysql-test/rh-skipped-tests.list ${RPM_BUILD_ROOT}%{_datadir}/mysql-test
 
+# we do not provide devel and embeded sub-packages,
+# soremove files from that sub-packages
+unlink ${RPM_BUILD_ROOT}%{_libdir}/mysql/libmysqld.so
+rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/libmysqld.so.*
+rm -f ${RPM_BUILD_ROOT}%{_bindir}/mysql_client_test_embedded
+rm -f ${RPM_BUILD_ROOT}%{_bindir}/mysqltest_embedded
+rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mysql_client_test_embedded.1*
+rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mysqltest_embedded.1*
+
+rm -rf ${RPM_BUILD_ROOT}%{_includedir}/mysql
+rm -f ${RPM_BUILD_ROOT}%{_datadir}/aclocal/mysql.m4
+unlink ${RPM_BUILD_ROOT}%{_libdir}/mysql/libmysqlclient.so
+unlink ${RPM_BUILD_ROOT}%{_libdir}/mysql/libmysqlclient_r.so
+rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/libmysqlclient.so.*
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -549,7 +523,6 @@ fi
 # libs package because it can be used for client settings too.
 %config(noreplace) %{_sysconfdir}/my.cnf
 %dir %{_libdir}/mysql
-%{_libdir}/mysql/libmysqlclient.so.*
 
 %dir %{_datadir}/mysql
 %{_datadir}/mysql/english
@@ -664,26 +637,6 @@ fi
 %attr(0640,mysql,mysql) %config(noreplace) %verify(not md5 size mtime) %{?_scl_root}/var/log/mysqld.log
 %config(noreplace) %{?scl:%_root_sysconfdir}%{!?scl:%_sysconfdir}/logrotate.d/%{?scl_prefix}mysqld
 
-%files devel
-%defattr(-,root,root)
-%{_includedir}/mysql
-%{_datadir}/aclocal/mysql.m4
-%{_libdir}/mysql/libmysqlclient.so
-%{_libdir}/mysql/libmysqlclient_r.so
-
-%files embedded
-%defattr(-,root,root)
-%doc README COPYING README.mysql-license
-%{_libdir}/mysql/libmysqld.so.*
-
-%files embedded-devel
-%defattr(-,root,root)
-%{_libdir}/mysql/libmysqld.so
-%{_bindir}/mysql_client_test_embedded
-%{_bindir}/mysqltest_embedded
-%{_mandir}/man1/mysql_client_test_embedded.1*
-%{_mandir}/man1/mysqltest_embedded.1*
-
 %files bench
 %defattr(-,root,root)
 %{_datadir}/sql-bench