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

Accepting request 195494 from KDE:Qt5

Browse Source 
Fix INSTALL_LIBDIR_RPM and INSTALL_PLUGINDIR_RPM, they need to point to %_lib, not %_libdir
Drop so symlink generation and removal, that is not necessary and breaks non x86_64 builds of dependent packages

OBS-URL: https://build.opensuse.org/request/show/195494
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=131
This commit is contained in:
Michal Hrusecky (old before rename to _miska_) 2013-08-21 12:50:06 +00:00 committed by Git OBS Bridge
parent a9047ea8f8
commit 5a7975002d
3 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.inc
View File

@ -114,8 +114,8 @@ BuildMySQL() {
-DWITH_EMBEDDED_SERVER=true \ -DWITH_EMBEDDED_SERVER=true \
-DCOMPILATION_COMMENT="openSUSE package" \ -DCOMPILATION_COMMENT="openSUSE package" \
-DDENABLE_DOWNLOADS=false \ -DDENABLE_DOWNLOADS=false \
-DINSTALL_PLUGINDIR_RPM="%{_libdir}/mysql/plugin" \ -DINSTALL_PLUGINDIR_RPM="%{_lib}/mysql/plugin" \
-DINSTALL_LIBDIR_RPM="%{_libdir}" \ -DINSTALL_LIBDIR_RPM="%{_lib}" \
"$@" .. "$@" ..
make %{?jobs:-j%jobs} make %{?jobs:-j%jobs}
nm --numeric-sort sql/mysqld > sql/mysqld.sym nm --numeric-sort sql/mysqld > sql/mysqld.sym

17
install.inc
View File

@ -125,23 +125,6 @@ cat mysql-ndb-storage.files mysql-ndb-management.files \
rm -f .$tmp rm -f .$tmp
done done
%endif %endif
pushd '%buildroot'/%_libdir
for i in *.so.*.*.*; do
if [ -L "$i" ]; then
trg="`readlink "$i"`"
rm "$i"
mv "$trg" "$i"
ln -s "$i" "$trg"
fi
done
for i in *.so.*; do
if [ -L "$i" ] && [ -L "`readlink "$i"`" ]; then
trg="`readlink "$i"`"
rm "$i"
ln -s "`readlink "$trg"`" "$i"
fi
done
popd
%if ! 0%{prefered} > 0 %if ! 0%{prefered} > 0
cat libmysqlclient-devel.files | sed 's|%%doc\ ||' | while read tmp; do cat libmysqlclient-devel.files | sed 's|%%doc\ ||' | while read tmp; do
cd '%buildroot' cd '%buildroot'

8
mariadb.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sat Aug 17 13:46:26 UTC 2013 - hrvoje.senjan@gmail.com
- Fix INSTALL_LIBDIR_RPM and INSTALL_PLUGINDIR_RPM, they need to
point to %_lib, not %_libdir
- Drop so symlink generation and removal, that is not necessary and
breaks non x86_64 builds of dependent packages
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 12 14:32:51 CEST 2013 - mhrusecky@suse.cz Mon Aug 12 14:32:51 CEST 2013 - mhrusecky@suse.cz