[packages/mysql-utilities] up to 1.3.6 (November 26, 2013)
glen
glen at pld-linux.org
Thu May 1 14:49:44 CEST 2014
commit 28eceed5addd08fa8013aeb60cdecc18e9cdfc55
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Thu May 1 14:54:31 2014 +0300
up to 1.3.6 (November 26, 2013)
mu-man.patch | 11 -----------
mysql-utilities.spec | 21 +++++----------------
paths.patch | 50 +++++---------------------------------------------
3 files changed, 10 insertions(+), 72 deletions(-)
---
diff --git a/mysql-utilities.spec b/mysql-utilities.spec
index 5d3f600..449a584 100644
--- a/mysql-utilities.spec
+++ b/mysql-utilities.spec
@@ -1,16 +1,13 @@
Summary: Scripts for managing and administering MySQL servers
Name: mysql-utilities
-Version: 1.3.1
-Release: 0.1
+Version: 1.3.6
+Release: 1
License: GPL v2
Group: Applications/Databases
-#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
+# Source0-md5: 3340c775b06c9cbf7de5df57ffb6ce22
+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
@@ -33,25 +30,17 @@ are used for maintaining and administering MySQL servers, including:
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!
-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
+%patch1 -p1
%build
%install
rm -rf $RPM_BUILD_ROOT
-#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
%py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir}
%py_postclean
diff --git a/mu-man.patch b/mu-man.patch
deleted file mode 100644
index 63dfb4e..0000000
--- a/mu-man.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mysql-utilities/setup.py.orig 2011-05-28 08:32:01.667811328 +0200
-+++ mysql-utilities/setup.py 2011-05-28 08:32:30.464887518 +0200
-@@ -110,7 +110,7 @@ class install_man(distutils.core.Command
- self.set_undefined_options('build_sphinx',
- ('build_dir', 'build_dir'),
- )
-- self.target_dir = os.path.join(self.install_base, 'man')
-+ self.target_dir = os.path.join(self.install_base, 'share/man')
- self.source_dir = os.path.join(self.build_dir, 'man')
-
- def run(self):
diff --git a/paths.patch b/paths.patch
index e96c4fe..c05d282 100644
--- a/paths.patch
+++ b/paths.patch
@@ -9,54 +9,14 @@
def build_variable_dictionary_list(args):
"""Build a variable dictionary from the arguments
---- 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 @@
+--- mysql-utilities-1.3.6/mysql/utilities/common/utilities.py~ 2014-05-01 15:21:49.000000000 +0300
++++ mysql-utilities-1.3.6/mysql/utilities/common/utilities.py 2014-05-01 15:23:35.067914839 +0300
+@@ -98,7 +98,7 @@
return None
needle_name = 'mysqlreplicate'
- needles = [needle_name + ".py"]
+ needles = [needle_name]
- if os.name == "nt":
+ 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)
-
-- files = os.listdir(self.util_path)
-+ files = 'HERE BE DRAGONS'.split(' ')
-
- working_utils = []
- for file_name in files:
-+ # XXX mysql devs: RTFM: splitext always returns len(parts) == 2
- parts = os.path.splitext(file_name)
- # Only accept python files - not .pyc and others
- # 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
-- command = util_name + ".py"
-+ command = util_name
- if not os.path.exists(os.path.join(util_path, command)):
- command = file_name
- cmd = []
+ else:
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mysql-utilities.git/commitdiff/28eceed5addd08fa8013aeb60cdecc18e9cdfc55
More information about the pld-cvs-commit
mailing list