[packages/mysql-utilities] up to 1.3.1
glen
glen at pld-linux.org
Thu May 1 14:49:39 CEST 2014
commit 671ab88ca3f55481f712865803659178d9efc282
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Thu May 2 15:58:41 2013 +0300
up to 1.3.1
mysql-utilities.spec | 52 ++++++++++++++++-------------
paths.patch | 92 +++++++++++++++++++++++++---------------------------
2 files changed, 74 insertions(+), 70 deletions(-)
---
diff --git a/mysql-utilities.spec b/mysql-utilities.spec
index 8c40894..5d3f600 100644
--- a/mysql-utilities.spec
+++ b/mysql-utilities.spec
@@ -1,15 +1,16 @@
-# NOTE: Not yet published (currently bundled with mysql-workbench),
Summary: Scripts for managing and administering MySQL servers
Name: mysql-utilities
-Version: 1.1.1
-Release: 1
+Version: 1.3.1
+Release: 0.1
License: GPL v2
Group: Applications/Databases
-Source0: ftp://ftp.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/mysql-workbench-gpl-5.2.45-src.tar.gz
-# Source0-md5: 9cb676dd11ae54e3b6b9819331050122
-Patch0: mu-man.patch
-Patch1: paths.patch
-URL: https://code.launchpad.net/mysql-utilities
+#Source0: ftp://ftp.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQLGUITools/mysql-workbench-gpl-5.2.46-src.tar.gz
+Source0: http://cdn.mysql.com/Downloads/MySQLGUITools/%{name}-%{version}.tar.gz
+# Source0-md5: b758d0b6a69df8981fdcafc42d74ea85
+#Patch0: mu-man.patch
+#Patch1: paths.patch
+URL: http://dev.mysql.com/downloads/tools/utilities/
+#URL: https://code.launchpad.net/mysql-utilities
BuildRequires: python-Sphinx >= 1.0
BuildRequires: python-devel >= 1:2.4
BuildRequires: rpm-pythonprov
@@ -20,15 +21,20 @@ BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
-MySQL Utilities contain a collection of scripts useful for managing
-and administering MySQL servers.
+MySQL Utilities provides a collection of command-line utilities that
+are used for maintaining and administering MySQL servers, including:
+
+- Admin Utilities (Clone, Copy, Compare, Diff, Export, Import)
+- Replication Utilities (Setup, Configuration)
+- General Utilities (Disk Usage, Redundant Indexes, Search Meta Data)
%prep
-%setup -qc
-mv mysql-workbench-gpl-*-src/ext/%{name}/* .
-%{__rm} -r mysql-workbench-gpl-*-src
-%patch0 -p1
-%patch1 -p1
+%setup -q
+v=$(head -n1 CHANGES.txt | awk '{print $2}')
+test "$v" = "%{version}"
+
+#%patch0 -p1
+#%patch1 -p1
# build static list of mysql utilities
# because otherwise it will try to run python --help for every *.py it finds from /usr/bin!
@@ -36,20 +42,16 @@ for py in scripts/*.py; do basename $py .py; done > scripts.manifest
%{__sed} -i -e "s/'HERE BE DRAGONS'/'$(xargs < scripts.manifest)'/" mysql/utilities/common/utilities.py
%build
-v=$(head -n1 CHANGES.txt | awk '{print $2}')
-test "$v" = "%{version}"
-%{__python} setup.py build_man
-
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_mandir}/man1
-%{__python} setup.py install \
+#install -d $RPM_BUILD_ROOT%{_mandir}/man1
+%{__python} setup.py install_man install \
--skip-profile \
--root $RPM_BUILD_ROOT
# packaged by python-mysql-connector
%{__rm} $RPM_BUILD_ROOT%{py_sitescriptdir}/mysql/__init__.py*
-%{__rm} -r $RPM_BUILD_ROOT%{py_sitescriptdir}/mysql/connector
+#%{__rm} -r $RPM_BUILD_ROOT%{py_sitescriptdir}/mysql/connector
%py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir}
%py_postclean
@@ -60,6 +62,8 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc *.txt
+%attr(755,root,root) %{_bindir}/mysqlauditadmin
+%attr(755,root,root) %{_bindir}/mysqlauditgrep
%attr(755,root,root) %{_bindir}/mysqldbcompare
%attr(755,root,root) %{_bindir}/mysqldbcopy
%attr(755,root,root) %{_bindir}/mysqldbexport
@@ -67,6 +71,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/mysqldiff
%attr(755,root,root) %{_bindir}/mysqldiskusage
%attr(755,root,root) %{_bindir}/mysqlfailover
+%attr(755,root,root) %{_bindir}/mysqlfrm
%attr(755,root,root) %{_bindir}/mysqlindexcheck
%attr(755,root,root) %{_bindir}/mysqlmetagrep
%attr(755,root,root) %{_bindir}/mysqlprocgrep
@@ -78,7 +83,8 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/mysqlserverinfo
%attr(755,root,root) %{_bindir}/mysqluc
%attr(755,root,root) %{_bindir}/mysqluserclone
-%{_mandir}/man1/mut.1*
+%{_mandir}/man1/mysqlauditadmin.1*
+%{_mandir}/man1/mysqlauditgrep.1*
%{_mandir}/man1/mysqldbcompare.1*
%{_mandir}/man1/mysqldbcopy.1*
%{_mandir}/man1/mysqldbexport.1*
diff --git a/paths.patch b/paths.patch
index bae01c9..e96c4fe 100644
--- a/paths.patch
+++ b/paths.patch
@@ -9,56 +9,54 @@
def build_variable_dictionary_list(args):
"""Build a variable dictionary from the arguments
---- mysql-utilities-1.1.0/mysql/utilities/common/utilities.py~ 2012-09-26 23:50:47.000000000 +0300
-+++ mysql-utilities-1.1.0/mysql/utilities/common/utilities.py 2012-10-05 00:20:03.354069432 +0300
-@@ -42,7 +42,7 @@
+--- mysql-utilities-1.2.0/mysql/utilities/command/utilitiesconsole.py~ 2013-01-31 14:54:30.000000000 +0200
++++ mysql-utilities-1.2.0/mysql/utilities/command/utilitiesconsole.py 2013-04-25 11:01:52.097092325 +0300
+@@ -271,7 +271,7 @@
+ else:
+ parts = os.path.splitext(command)
+ if parts[1] == "":
+- exts = [command+'.py', command+'.exe']
++ exts = [command, command+'.py', command+'.exe']
+ for ext in exts:
+ utility_path = os.path.join(path, ext)
+ if os.path.isfile(utility_path):
+--- mysql-utilities-1.2.0/mysql/utilities/common/utilities.py~ 2013-01-31 14:54:34.000000000 +0200
++++ mysql-utilities-1.2.0/mysql/utilities/common/utilities.py 2013-04-25 11:00:17.732812679 +0300
+@@ -57,7 +57,7 @@
+ return None
+
+ needle_name = 'mysqlreplicate'
+- needles = [needle_name + ".py"]
++ needles = [needle_name]
+ if os.name == "nt":
+ needles.append(needle_name + ".exe")
+ else:
+@@ -145,16 +145,17 @@
+ pattern_alias = "\s+\-(\w+)\s*" # match Alias of the form <-Alias>
+ self.program_name = re.compile(pattern_alias)
- Returns string - path to utilities or None if not found
- """
-- needle = 'mysqlreplicate.py'
-+ needle = 'mysqlreplicate'
-
- # Try the default by itself
- if os.path.isfile(os.path.join(default_path, needle)):
---- mysql-utilities-1.1.0/./mysql/utilities/command/utilitiesconsole.py~ 2012-09-26 23:50:42.000000000 +0300
-+++ mysql-utilities-1.1.0/./mysql/utilities/command/utilitiesconsole.py 2012-10-05 00:48:39.151811044 +0300
-@@ -263,8 +263,8 @@
- """
- import subprocess
-
-- if not os.path.splitext(command.lower()) == '.py':
-- command += '.py'
-+# if not os.path.splitext(command.lower()) == '.py':
-+# command += '.py'
- if not command.lower().startswith('mysql'):
- command = 'mysql' + command
- cmd = 'python ' + os.path.join(self.utils.util_path, command)
---- mysql-utilities-1.1.0/./mysql/utilities/common/utilities.py 2012-10-05 00:53:12.070889308 +0300
-+++ mysql-utilities-1.1.0/./mysql/utilities/common/utilities.py 2012-10-05 00:53:12.070889308 +0300
-@@ -95,13 +95,14 @@
-
- This method builds a list of utilities.
- """
- files = os.listdir(self.util_path)
+ files = 'HERE BE DRAGONS'.split(' ')
- for file in files:
+
+ working_utils = []
+ for file_name in files:
+ # XXX mysql devs: RTFM: splitext always returns len(parts) == 2
- parts = os.path.splitext(file)
+ parts = os.path.splitext(file_name)
# Only accept python files - not .pyc and others
-- if (len(parts) == 2 and parts[1] == '.py' and \
-+ if (parts[1] == '.py' and \
- parts[0] not in _EXCLUDE_UTILS) or \
-- (len(parts) ==1 and parts[0] not in _EXCLUDE_UTILS):
-+ (parts[1] == '' and parts[0] not in _EXCLUDE_UTILS):
- util_name = parts[0]
- util_info = self._get_util_info(self.util_path, util_name)
- self.util_list.append(util_info)
-@@ -136,7 +137,7 @@
-
+ # Parts returns second as empty if does not have ext, so len is 2
+ exts = ['.py', '.exe', '']
+ if (parts[0] not in _EXCLUDE_UTILS and
+- (len(parts) == 1 or (len(parts) == 2 and parts[1] in exts))):
++ (parts[1] == '' or (parts[1] in exts))):
+ util_name = str(parts[0])
+ if util_name not in working_utils:
+ util_info = self._get_util_info(self.util_path, util_name,
+@@ -175,7 +176,7 @@
+ Returns dictionary - name, description, usage, options
+ """
# Get the --help output for the utility
- util_cmd = "python " + os.path.join(util_path,
-- util_name+'.py') + " --help"
-+ util_name) + " --help"
- file = tempfile.TemporaryFile()
- proc = subprocess.Popen(util_cmd, shell=True,
- stdout=file, stderr=file)
+- command = util_name + ".py"
++ command = util_name
+ if not os.path.exists(os.path.join(util_path, command)):
+ command = file_name
+ cmd = []
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mysql-utilities.git/commitdiff/28eceed5addd08fa8013aeb60cdecc18e9cdfc55
More information about the pld-cvs-commit
mailing list