rpm/mariadb
SHA256
1
0
Fork 0
forked from pool/mariadb
Code Pull Requests Activity

better merge

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=147
This commit is contained in:
Michal Hrusecky (old before rename to _miska_) 2014-05-23 08:06:28 +00:00 committed by Git OBS Bridge
parent 66bae66355
commit b324957121
6 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build.inc
View File

@ -73,7 +73,7 @@ BuildMySQL() {
popd
}
# Build the client, extra tools, libraries
%if 0%{?prefered} > 0
%if 0%{?preferred} > 0
BuildMySQL "" --with-embedded-server
%else
BuildMySQL "" --without-embedded-server
@ -81,7 +81,7 @@ BuildMySQL "" --without-embedded-server
# build mysqld-debug
BuildMySQL "-debug" --with-debug --without-embedded-server
%if 0%{?prefered} > 0
%if 0%{?preferred} > 0
mkdir -p _buildlibmysqld/tmp
cd _buildlibmysqld/tmp
ar -x ../../_build/libmysqld/libmysqld.a
@ -101,7 +101,7 @@ BuildMySQL() {
shift
cmake -DWITH_SSL=system \
-DWITH_ZLIB=system \
-DWITH_LIBEVENT=system \
-DWITH_LIBEVENT=system \
-DWITH_JEMALLOC=no \
-DWITH_READLINE=0 \
-DWITH_LIBEDIT=0 \
@ -125,5 +125,6 @@ BuildMySQL() {
}
BuildMySQL "" -DCMAKE_BUILD_TYPE=Release -DINSTALL_SQLBENCHDIR=share
# TokuDB can't be compiled without optimisations turned on
BuildMySQL "-debug" -DCMAKE_BUILD_TYPE=Debug -DWITHOUT_TOKUDB=1
%endif

4
configuration-tweaks.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f58c6f356cfb58f906c9610b7708a35e19f65b829756b231cae48f1f56c636c3
size 316
oid sha256:fe449958e77e4d7a03f6180e83b8c6bc12b004fcc4b139f8748779c7180cba2d
size 312

4
install.inc
View File

@ -76,7 +76,7 @@ DOCDIR=%buildroot%_defaultdocdir/%name
install -d -m 755 ${DOCDIR}
install -d -m 755 %buildroot/etc/logrotate.d
install -m 644 _build/support-files/mysql-log-rotate %buildroot/etc/logrotate.d/mysql
%if 0%{?prefered} > 0%{?use_cmake}
%if 0%{?preferred} > 0%{?use_cmake}
install -m 644 _buildlibmysqld/*.so* %buildroot%_libdir
ln -s libmysqld.so.0.0.1 %buildroot%_libdir/libmysqld.so.0
ln -s libmysqld.so.0.0.1 %buildroot%_libdir/libmysqld.so
@ -131,7 +131,7 @@ cat mysql-ndb-storage.files mysql-ndb-management.files \
rm -f .$tmp
done
%endif
%if ! 0%{prefered} > 0
%if ! 0%{preferred} > 0
cat libmysqlclient-devel.files | sed 's|%%doc\ ||' | while read tmp; do
cd '%buildroot'
rm -f ."$tmp"

22
mariadb.spec
View File

@ -16,7 +16,7 @@
#
# Few definitions which will alter build
%define prefered 01
%define preferred 01
%define use_systemd 01
%define use_cmake 01
%define cluster 00
@ -113,7 +113,7 @@ Provides: mysql-Max = %{srv_vers}
Provides: %{extra_provides} = %{version}
Obsoletes: %{extra_provides} < %{version}
%endif
%if 0%{?prefered} > 0
%if 0%{?preferred} > 0
%if "%{name}" != mysql
Obsoletes: mysql < %{srv_vers}
%endif
@ -128,7 +128,7 @@ the Maria storage engine.
This package only contains the server-side programs.
%if 0%{?prefered} > 0
%if 0%{?preferred} > 0
%package -n libmysqlclient-devel
# mysql-devel was last used in openSUSE 10.2
Provides: mysql-devel = %srv_vers-%release
@ -198,7 +198,7 @@ Provides: %{extra_provides}-client = %{version}
Obsoletes: %{extra_provides}-client < %{version}
%endif
Requires: %{name}-errormessages = %version
%if 0%{?prefered} > 0
%if 0%{?preferred} > 0
%if "%{name}" != mysql
Obsoletes: mysql-client < %{srv_vers}
%endif
@ -228,7 +228,7 @@ Provides: mysql-bench = %{srv_vers}
Provides: %{extra_provides}-bench = %{version}
Obsoletes: %{extra_provides}-bench < %{version}
%endif
%if 0%{?prefered} > 0
%if 0%{?preferred} > 0
%if "%{name}" != mysql
Obsoletes: mysql-bench < %{srv_vers}
%endif
@ -252,7 +252,7 @@ Provides: mysql-debug = %{srv_vers}
Provides: %{extra_provides}-debug-verion = %{version}
Obsoletes: %{extra_provides}-debug-version < %{version}
%endif
%if 0%{?prefered} > 0
%if 0%{?preferred} > 0
Obsoletes: mysql-debug < %{srv_vers}
%endif
Conflicts: otherproviders(mysql-debug)
@ -279,7 +279,7 @@ Provides: mysql-test = %{srv_vers}
Provides: %{extra_provides}-test = %{version}
Obsoletes: %{extra_provides}-test < %{version}
%endif
%if 0%{?prefered} > 0
%if 0%{?preferred} > 0
%if "%{name}" != mysql
Obsoletes: mysql-test < %{srv_vers}
%endif
@ -305,7 +305,7 @@ Provides: mysql:/usr/bin/mysqlhotcopy
Provides: %{extra_provides}-tools = %{version}
Obsoletes: %{extra_provides}-tools < %{version}
%endif
%if 0%{?prefered} > 0
%if 0%{?preferred} > 0
%if "%{name}" != mysql
Obsoletes: mysql-tools < %{srv_vers}
%endif
@ -405,7 +405,7 @@ rm -f man/ndbd_redo_log_reader.1
# breaks VPATH builds when in sourcedir, is generated in the builddirs
rm -f sql/sql_builtin.cc
sed -i 's|@localstatedir@|/var/log|' support-files/mysql-log-rotate.sh
%if 0%{prefered} < 1
%if 0%{preferred} < 1
for i in `grep -Rl mysqlclient .`; do
sed -i 's|mysqlclient|mysqlclient|g' $i
sed -i 's|-libmysqlclient-symbols.patch|-libmysqlclient-symbols.patch|g' $i
@ -508,7 +508,7 @@ fi
%postun -n libndbclient6 -p /sbin/ldconfig
%endif
%if 0%{prefered} > 0
%if 0%{preferred} > 0
%post -n libmysqld18 -p /sbin/ldconfig
%postun -n libmysqld18 -p /sbin/ldconfig
@ -566,7 +566,7 @@ fi
%files client -f mysql-client.files
%defattr(-, root, root)
%if 0%{prefered} > 0
%if 0%{preferred} > 0
%files -n libmysqlclient-devel -f libmysqlclient-devel.files
%defattr(-, root, root)
/usr/include/mysql

4
mysql-patches.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ccb241bbd329ca03ce33a169ddbddb99deae969936912d4024abda64706439a9
size 13070
oid sha256:6d38fbbdba838bd2f80cb8d278fbeeac0a182eb2f92ec035df1dee7b9c9417ff
size 24470

1
series
View File

@ -13,3 +13,4 @@ mariadb-10.0.5-deharcode-libdir.patch
mysql-5.5.31-upgrade-datadir.patch
mysql-community-server-5.6.12-srv_buf_size.patch
mariadb-10.0.9-perl-in-bench.patch
mariadb-10.0.11-header_files_const_warnings.patch