development/mysql-workbench-gpl: Renamed to mysql-workbench and Updated for version 6.0.7

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackware-id.org>
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

8 files changed, 37 insertions, 37 deletions

diff --git a/development/mysql-workbench-gpl/mysql-workbench-gpl.info b/development/mysql-workbench-gpl/mysql-workbench-gpl.info
deleted file mode 100644
index 5298fecdb9..0000000000
--- a/development/mysql-workbench-gpl/mysql-workbench-gpl.info
+++ /dev/null
@@ -1,10 +0,0 @@
-PRGNAM="mysql-workbench-gpl"
-VERSION="6.0.4"
-HOMEPAGE="http://www.mysql.com/downloads/workbench/"
-DOWNLOAD="http://www.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/mysql-workbench-gpl-6.0.4-src.tar.gz"
-MD5SUM="c2c09a570dbb9a92c8115cc20585ef51"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="tinyxml mysql-connector-c++ vsqlite++ gtkmm ctemplate paramiko pexpect lua wxPython"
-MAINTAINER="Willy Sudiarto Raharjo"
-EMAIL="willysr@slackware-id.org"
diff --git a/development/mysql-workbench-gpl/slack-desc b/development/mysql-workbench-gpl/slack-desc
deleted file mode 100644
index 5a11bd884f..0000000000
--- a/development/mysql-workbench-gpl/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':' except on otherwise blank lines.
-
-                   |-----handy-ruler------------------------------------------------------|
-mysql-workbench-gpl: mysql-workbench - MySQL Workbench (GUI Tool)
-mysql-workbench-gpl:
-mysql-workbench-gpl: MySQL Workbench provides DBAs and developers an integrated tools
-mysql-workbench-gpl: environment for:
-mysql-workbench-gpl:
-mysql-workbench-gpl: Database Design & Modeling
-mysql-workbench-gpl: SQL Development (replacing MySQL Query Browser)
-mysql-workbench-gpl: Database Administration (replacing MySQL Administrator)
-mysql-workbench-gpl:
-mysql-workbench-gpl: The Community (OSS) Edition is available under the GPL.
-mysql-workbench-gpl:
diff --git a/development/mysql-workbench-gpl/README b/development/mysql-workbench/README
index bb9d38ca1d..9afc1c8f09 100644
--- a/development/mysql-workbench-gpl/README
+++ b/development/mysql-workbench/README
@@ -1,7 +1,7 @@
 MySQL Workbench is a cross-platform, visual database design tool developed
 by MySQL.  It is the highly anticipated successor application of the
 DBDesigner4 project.  MySQL Workbench is available as a native GUI tool
-on Windows, Linux and OS X in different editions.
+on Windows, Linux, and OS X in different editions.
 
 MySQL Workbench provides DBAs and developers an integrated tools
 environment for:
diff --git a/development/mysql-workbench-gpl/config_and_ifconfig_paths.patch b/development/mysql-workbench/config_and_ifconfig_paths.patch
index fbeac75803..fbeac75803 100644
--- a/development/mysql-workbench-gpl/config_and_ifconfig_paths.patch
+++ b/development/mysql-workbench/config_and_ifconfig_paths.patch
diff --git a/development/mysql-workbench-gpl/doinst.sh b/development/mysql-workbench/doinst.sh
index 9424ce43ff..9424ce43ff 100644
--- a/development/mysql-workbench-gpl/doinst.sh
+++ b/development/mysql-workbench/doinst.sh
diff --git a/development/mysql-workbench-gpl/mysql-workbench-gpl.SlackBuild b/development/mysql-workbench/mysql-workbench.SlackBuild
index 3b6669fcf0..41338c2c4e 100644
--- a/development/mysql-workbench-gpl/mysql-workbench-gpl.SlackBuild
+++ b/development/mysql-workbench/mysql-workbench.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Slackware build script for mysql-workbench-gpl
+# Slackware build script for mysql-workbench
 
 # Originally written by André Geraldo Vieira <andre.geraldo@gmail.com>
 # Copyright 2013 Willy Sudiarto Raharjo <willysr@slackware-id.org>
@@ -23,8 +23,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=mysql-workbench-gpl
-VERSION=${VERSION:-6.0.4}
+PRGNAM=mysql-workbench
+VERSION=${VERSION:-6.0.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -62,9 +62,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$SRCVERSION
-tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.gz
-cd $PRGNAM-$SRCVERSION
+rm -rf $PRGNAM-community-$SRCVERSION
+tar xvf $CWD/$PRGNAM-community-$SRCVERSION.tar.gz
+cd $PRGNAM-community-$SRCVERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -89,7 +89,7 @@ make
 
 # we will remove it later after installation
 # without these document, it will fail to build
-touch $TMP/$PRGNAM-$SRCVERSION/LICENSE.mysql
+touch $TMP/$PRGNAM-community-$SRCVERSION/LICENSE.mysql
 
 make install DESTDIR=$PKG
 
diff --git a/development/mysql-workbench/mysql-workbench.info b/development/mysql-workbench/mysql-workbench.info
new file mode 100644
index 0000000000..45913c675f
--- /dev/null
+++ b/development/mysql-workbench/mysql-workbench.info
@@ -0,0 +1,10 @@
+PRGNAM="mysql-workbench"
+VERSION="6.0.7"
+HOMEPAGE="https://www.mysql.com/downloads/workbench/"
+DOWNLOAD="http://www.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-6.0.7-src.tar.gz"
+MD5SUM="6c85e2707950dc2f1c69fac86ca905df"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="tinyxml ecdsa mysql-connector-c++ vsqlite++ gtkmm ctemplate paramiko pexpect lua wxPython"
+MAINTAINER="Willy Sudiarto Raharjo"
+EMAIL="willysr@slackware-id.org"
diff --git a/development/mysql-workbench/slack-desc b/development/mysql-workbench/slack-desc
new file mode 100644
index 0000000000..ee9f34bcf8
--- /dev/null
+++ b/development/mysql-workbench/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+               |-----handy-ruler------------------------------------------------------|
+mysql-workbench: mysql-workbench - MySQL Workbench (GUI Tool)
+mysql-workbench:
+mysql-workbench: MySQL Workbench provides DBAs and developers an integrated tools
+mysql-workbench: environment for:
+mysql-workbench:
+mysql-workbench: Database Design & Modeling
+mysql-workbench: SQL Development (replacing MySQL Query Browser)
+mysql-workbench: Database Administration (replacing MySQL Administrator)
+mysql-workbench:
+mysql-workbench: The Community (OSS) Edition is available under the GPL.
+mysql-workbench: