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

Accepting request 210503 from server:database

Browse Source 
Fix bnc#829430 by moving .so into libmysqlclient(_r)?18 subpackages. rpmlint's warnings about them being devel files are bogus, but badness was over the limit, so fixed another rpmlint warning about bad shebangs in bench. (forwarded request 206812 from klaussfreire)

OBS-URL: https://build.opensuse.org/request/show/210503
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb?expand=0&rev=35
This commit is contained in:
Stephan Kulow 2013-12-16 06:08:09 +00:00 committed by Git OBS Bridge
commit 113a2407f7
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mariadb.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Wed Nov 13 17:40:37 UTC 2013 - klaussfreire@gmail.com
- Fix perl shebangs
-------------------------------------------------------------------
Wed Nov 13 16:45:10 UTC 2013 - klaussfreire@gmail.com
- bnc#829430: Move libmysqlclient.so and libmysqlclient_r.so from
libmysqlclient-devel into libmysqlclient18 and libmysqlclient_r18
subpackages respectively
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 23 10:46:28 UTC 2013 - bbrunner@suse.com Mon Sep 23 10:46:28 UTC 2013 - bbrunner@suse.com

10
mariadb.spec
View File

@ -406,6 +406,10 @@ done
rm -f mysql-test/t/file_contents.test mysql-test/r/file_contents.result rm -f mysql-test/t/file_contents.test mysql-test/r/file_contents.result
# Present only in newer MariaDB, big change, needs fixing & testing # Present only in newer MariaDB, big change, needs fixing & testing
rm -rf storage/tokudb rm -rf storage/tokudb
# Specify perl path on shebangs
for i in `grep -Rl '^#!@PERL@$' .`; do
sed -i 's|#!@PERL@|/usr/bin/perl|' $i
done
%build %build
%{expand:%(cat %_sourcedir/build.inc)} %{expand:%(cat %_sourcedir/build.inc)}
@ -544,8 +548,6 @@ fi
%files -n libmysqlclient-devel -f libmysqlclient-devel.files %files -n libmysqlclient-devel -f libmysqlclient-devel.files
%defattr(-, root, root) %defattr(-, root, root)
/usr/include/mysql /usr/include/mysql
%{_libdir}/libmysqlclient.so
%{_libdir}/libmysqlclient_r.so
%dir /usr/share/aclocal %dir /usr/share/aclocal
/usr/share/aclocal/mysql.m4 /usr/share/aclocal/mysql.m4
@ -561,7 +563,7 @@ fi
%files -n libmysqlclient18 %files -n libmysqlclient18
%defattr(-, root, root) %defattr(-, root, root)
%{_libdir}/libmysqlclient.so.* %{_libdir}/libmysqlclient.so*
%if 0%{cluster} > 1 %if 0%{cluster} > 1
%files -n libndbclient6 %files -n libndbclient6
@ -571,7 +573,7 @@ fi
%files -n libmysqlclient_r18 %files -n libmysqlclient_r18
%defattr(-, root, root) %defattr(-, root, root)
%{_libdir}/libmysqlclient_r.so.* %{_libdir}/libmysqlclient_r.so*
%files bench -f mysql-bench.files %files bench -f mysql-bench.files
%defattr(-, root, root) %defattr(-, root, root)