[mysql-workbench] try to fix with automake >= 1.11.2

[Remi Collet]

commit dbb83fbfe6c1daa81155b7eb3e99a2630474048c
Author: remi <fedora at famillecollet.com>
Date:   Sat Feb 4 19:44:33 2012 +0100

    try to fix with automake >= 1.11.2

 mysql-workbench-5.2.37-automake.patch |   47 +++++++++++++++++++++++++++++++++
 mysql-workbench.spec                  |   10 ++++---
 2 files changed, 53 insertions(+), 4 deletions(-)
---
diff --git a/mysql-workbench-5.2.37-automake.patch b/mysql-workbench-5.2.37-automake.patch
new file mode 100644
index 0000000..f6a3142
--- /dev/null
+++ b/mysql-workbench-5.2.37-automake.patch
@@ -0,0 +1,47 @@
+diff -up mysql-workbench-gpl-5.2.37-src/library/forms/swig/Makefile.am.auto mysql-workbench-gpl-5.2.37-src/library/forms/swig/Makefile.am
+--- mysql-workbench-gpl-5.2.37-src/library/forms/swig/Makefile.am.auto	2012-02-04 19:38:01.000000000 +0100
++++ mysql-workbench-gpl-5.2.37-src/library/forms/swig/Makefile.am	2012-02-04 19:38:57.000000000 +0100
+@@ -2,7 +2,7 @@
+ pkglib_LTLIBRARIES=_mforms.la
+ 
+ pkglibdir=$(libdir)/@PACKAGE@/modules
+-pkglib_DATA=mforms.py
++pkgdata_DATA=mforms.py
+ 
+ _mforms_la_SOURCES=\
+ mforms_wrap.cxx
+diff -up mysql-workbench-gpl-5.2.37-src/modules/wb.utils/Makefile.am.auto mysql-workbench-gpl-5.2.37-src/modules/wb.utils/Makefile.am
+--- mysql-workbench-gpl-5.2.37-src/modules/wb.utils/Makefile.am.auto	2012-02-04 19:37:49.000000000 +0100
++++ mysql-workbench-gpl-5.2.37-src/modules/wb.utils/Makefile.am	2012-02-04 19:38:39.000000000 +0100
+@@ -1,6 +1,6 @@
+ 
+ pkglibdir=$(libdir)/@PACKAGE@/modules
+ 
+-pkglib_DATA=catalog_utils.grt.lua  tools.grt.lua  wb_utils_grt.py sqlide_grt.py text_grt.py sql_reformatter.py\
++pkgdata_DATA=catalog_utils.grt.lua  tools.grt.lua  wb_utils_grt.py sqlide_grt.py text_grt.py sql_reformatter.py\
+             wb_dev_utils_grt.py table_utils_grt.py code_utils_grt.py
+ 
+diff -up mysql-workbench-gpl-5.2.37-src/plugins/wb.admin/frontend/Makefile.am.auto mysql-workbench-gpl-5.2.37-src/plugins/wb.admin/frontend/Makefile.am
+--- mysql-workbench-gpl-5.2.37-src/plugins/wb.admin/frontend/Makefile.am.auto	2012-02-04 19:38:14.000000000 +0100
++++ mysql-workbench-gpl-5.2.37-src/plugins/wb.admin/frontend/Makefile.am	2012-02-04 19:39:08.000000000 +0100
+@@ -1,7 +1,7 @@
+ 
+ pkglibdir=$(libdir)/@PACKAGE@/modules
+ 
+-pkglib_DATA=\
++pkgdata_DATA=\
+     wb_admin_grt.py\
+     wb_admin_monitor.py\
+     wb_admin_utils.py\
+diff -up mysql-workbench-gpl-5.2.37-src/plugins/wb.doclib/Makefile.am.auto mysql-workbench-gpl-5.2.37-src/plugins/wb.doclib/Makefile.am
+--- mysql-workbench-gpl-5.2.37-src/plugins/wb.doclib/Makefile.am.auto	2012-02-04 19:38:08.000000000 +0100
++++ mysql-workbench-gpl-5.2.37-src/plugins/wb.doclib/Makefile.am	2012-02-04 19:39:02.000000000 +0100
+@@ -1,7 +1,7 @@
+ 
+ pkglibdir=$(libdir)/@PACKAGE@/modules
+ 
+-pkglib_DATA=\
++pkgdata_DATA=\
+   mysqldoclib.py\
+   wb_doclib_grt.py
+ 
diff --git a/mysql-workbench.spec b/mysql-workbench.spec
index e295824..0c7d163 100644
--- a/mysql-workbench.spec
+++ b/mysql-workbench.spec
@@ -31,12 +31,12 @@ Patch2:    %{name}-5.2.32-ctemplate.patch
 Patch3:    %{name}-5.2.36-tinyxml.patch
 # redirect man page to /usr/share
 Patch5:    %{name}-5.2.34-man.patch
-# http://bugs.mysql.com/63705
-# Only <glib.h> can be included directly
+# http://bugs.mysql.com/63705 - Only <glib.h> can be included directly
 Patch6:    %{name}-5.2.36-glib.patch
-# http://bugs.mysql.com/63777
-# service startup/shutdown command
+# http://bugs.mysql.com/63777 - service startup/shutdown command
 Patch7:    %{name}-5.2.36-profiles.patch
+# http://bugs.mysql.com/63898 - fix for automake >= 1.11.2
+Patch8:    %{name}-5.2.37-automake.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pcre-devel >= 3.9
@@ -147,6 +147,7 @@ rm -rf library/tinyxml
 %patch5 -p1 -b .man
 %patch6 -p1 -b .glib
 %patch7 -p1 -b .profiles
+%patch8 -p1 -b .automake
 
 
 touch -r COPYING .timestamp4rpm
@@ -258,6 +259,7 @@ update-desktop-database &> /dev/null || :
 %changelog
 * Sat Feb 04 2012 Remi Collet <remi at fedoraproject.org> 5.2.37-3
 - rebuild for new libzip
+- add patch for automake > 1.11.2
 
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.2.37-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild