mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 04:22:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

redo optional files

Browse source
This commit is contained in:
Jonathan Perkin 2010-04-13 20:53:44 +02:00
parent 75e8c38144
commit 45d63b65e0
1 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
support-files/mysql.spec.sh
View file

@ -352,9 +352,6 @@ For a description of MySQL see the base MySQL RPM or http://www.mysql.com/
# Be strict about variables, bail at earliest opportunity, etc. # Be strict about variables, bail at earliest opportunity, etc.
set -eu set -eu
# Optional files to include
touch optional-files-server
# #
# Set environment in order of preference, MYSQL_BUILD_* first, then variable # Set environment in order of preference, MYSQL_BUILD_* first, then variable
# name, finally a default. RPM_OPT_FLAGS is assumed to be a part of the # name, finally a default. RPM_OPT_FLAGS is assumed to be a part of the
@ -430,7 +427,6 @@ then
then then
mkdir -p $RBR%{_libdir}/mysql mkdir -p $RBR%{_libdir}/mysql
install -m 644 $libgcc $RBR%{_libdir}/mysql/libmygcc.a install -m 644 $libgcc $RBR%{_libdir}/mysql/libmygcc.a
echo "%{_libdir}/mysql/libmygcc.a" >>optional-files-server
fi fi
fi fi
@ -483,6 +479,25 @@ install -m 644 "%{malloc_lib_source}" "$RBR%{_libdir}/mysql/%{malloc_lib_target}
# files' warning. # files' warning.
rm -f $RBR%{_mandir}/man1/make_win_bin_dist.1* rm -f $RBR%{_mandir}/man1/make_win_bin_dist.1*
#
# Set conditional package options for use in files section
#
# - libmygcc
#
%if %{fileexists $RBR%{_libdir}/mysql/libmygcc.a}
%define WITH_LIBGCC 1
%else
%define WITH_LIBGCC 0
%endif
#
# - innodb
#
%if %{fileexists $RBR%{_bindir}/innochecksum}
%define WITH_INNODB 1
%else
%define WITH_INNODB 0
%endif
############################################################################## ##############################################################################
# Post processing actions, i.e. when installed # Post processing actions, i.e. when installed
############################################################################## ##############################################################################
@ -660,7 +675,7 @@ fi
# Files section # Files section
############################################################################## ##############################################################################
%files -n MySQL-server%{product_suffix} -f optional-files-server %files -n MySQL-server%{product_suffix}
%defattr(-,root,root,0755) %defattr(-,root,root,0755)
%if %{defined license_files_server} %if %{defined license_files_server}
@ -671,7 +686,7 @@ fi
%doc %attr(644, root, root) %{_infodir}/mysql.info* %doc %attr(644, root, root) %{_infodir}/mysql.info*
%if %{fileexists $RPM_BUILD_ROOT%{_mandir}/man1/innochecksum.1*} %if %{WITH_INNODB}
%doc %attr(644, root, man) %{_mandir}/man1/innochecksum.1* %doc %attr(644, root, man) %{_mandir}/man1/innochecksum.1*
%endif %endif
%doc %attr(644, root, man) %{_mandir}/man1/my_print_defaults.1* %doc %attr(644, root, man) %{_mandir}/man1/my_print_defaults.1*
@ -703,7 +718,7 @@ fi
%ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf %ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf
%if %{fileexists $RPM_BUILD_ROOT%{_bindir}/innochecksum} %if %{WITH_INNODB}
%attr(755, root, root) %{_bindir}/innochecksum %attr(755, root, root) %{_bindir}/innochecksum
%endif %endif
%attr(755, root, root) %{_bindir}/my_print_defaults %attr(755, root, root) %{_bindir}/my_print_defaults
@ -795,6 +810,9 @@ fi
%dir %attr(755, root, root) %{_libdir}/mysql %dir %attr(755, root, root) %{_libdir}/mysql
%{_includedir}/mysql/* %{_includedir}/mysql/*
%{_datadir}/aclocal/mysql.m4 %{_datadir}/aclocal/mysql.m4
%if %{WITH_LIBGCC}
%{_libdir}/mysql/libmygcc.a
%endif
%{_libdir}/mysql/libmysqlclient.a %{_libdir}/mysql/libmysqlclient.a
%{_libdir}/mysql/libmysqlclient_r.a %{_libdir}/mysql/libmysqlclient_r.a
%{_libdir}/mysql/libmysqlservices.a %{_libdir}/mysql/libmysqlservices.a