Hello community,
here is the log from the commit of package mysql-workbench for openSUSE:Factory
checked in at 2014-09-19 13:56:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mysql-workbench (Old)
and /work/SRC/openSUSE:Factory/.mysql-workbench.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mysql-workbench"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mysql-workbench/mysql-workbench.changes
2014-07-20 10:49:51.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.mysql-workbench.new/mysql-workbench.changes
2014-09-19 15:45:37.000000000 +0200
@@ -1,0 +2,12 @@
+Thu Sep 11 18:13:07 UTC 2014 - michal.hruse...@opensuse.org
+
+- not using %cmake macro for now, causes too much troubles,
+ needs further investigation
+
+-------------------------------------------------------------------
+Sun Sep 7 12:16:37 UTC 2014 - michal.hruse...@opensuse.org
+
+- fix build by ommiting -Wl,--no-undefined
+- adding -Wl,-z,relro
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mysql-workbench.spec ++++++
--- /var/tmp/diff_new_pack.ShxLc2/_old 2014-09-19 15:45:40.000000000 +0200
+++ /var/tmp/diff_new_pack.ShxLc2/_new 2014-09-19 15:45:40.000000000 +0200
@@ -114,15 +114,15 @@
Suggests: gnome-keyring
Suggests: mysqldump
-Provides: %{name}-%{edition}
Provides: mysql-administrator = %{version}
Provides: mysql-gui-tools = %{version}
Provides: mysql-querybrovser = %{version}
+Provides: mysql-workbench-%{edition}
Obsoletes: mysql-administrator < %{version}
Obsoletes: mysql-gui-tools < %{version}
Obsoletes: mysql-querybrovser < %{version}
-Conflicts: %{name}-oss
-Conflicts: %{name}-com-se
+Conflicts: mysql-workbench-oss
+Conflicts: mysql-workbench-com-se
%description
MySQL Workbench is a modeling tool that allows you to design
@@ -146,17 +146,18 @@
# make %%{?jobs:-j2}
export PATH=$PWD/bin:$PATH
-%if 0%{?suse_version} >= 1310
+# Not using cmake macro as it sets modules LDFLAGS in way that
+# workbench doesn't work afterwards - more investigation needed.
+%if 0
# Make things more secure, but only on new version
- #export LDFLAGS="-Wl,-z,relro,-z,now -pie"
- export CFLAGS="%{optflags} -fPIE -pie"
- export CXXFLAGS="%{optflags} -fPIE -pie"
- %cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
- -DMYSQL_CONFIG_PATH=%{_bindir}/mysql_config \
- -DLIB_INSTALL_DIR=%{_libdir} \
+ export LDFLAGS="-Wl,-z,relro,-z,now -pie"
+ %cmake -DMYSQL_CONFIG_PATH=%{_bindir}/mysql_config \
-DCMAKE_BUILD_TYPE=%{edition} \
-DREAL_EXECUTABLE_DIR=%{_libdir}/%{name} \
-DUSE_UNIXODBC=FALSE \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_SKIP_INSTALL_RPATH=ON \
+ -DCMAKE_NO_BUILTIN_CHRPATH=ON \
..
make VERBOSE=1 %{?jobs:-j2}
%else
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
