diff --git a/.gitignore b/.gitignore index 1a20d59..e03b83e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,4 @@ /mypy-0.2.0-cd96f02.tar.gz /mypy-0.2.0-4127a66.tar.gz /mypy-0.2.0-9befcc7.tar.gz -/mypy-lang-*.tar.gz -/v0.4.1.tar.gz +/mypy-lang-0.3.1.tar.gz diff --git a/0001-Look-for-typeshed-in-usr-share.patch b/0001-Look-for-typeshed-in-usr-share.patch index 8ed4c95..439050d 100644 --- a/0001-Look-for-typeshed-in-usr-share.patch +++ b/0001-Look-for-typeshed-in-usr-share.patch @@ -9,10 +9,12 @@ Skip installing the bundled typeshed setup.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) +diff --git a/mypy/build.py b/mypy/build.py +index 4d01c5d..9f01b23 100644 --- a/mypy/build.py +++ b/mypy/build.py -@@ -257,7 +257,7 @@ def default_data_dir(bin_dir: str) -> st - return dir +@@ -233,7 +233,7 @@ def default_data_dir(bin_dir: str) -> str: + return os.path.dirname(bin_dir) elif base == 'bin': # Installed to somewhere (can be under /usr/local or anywhere). - return os.path.join(dir, 'lib', 'mypy') @@ -20,6 +22,8 @@ Skip installing the bundled typeshed elif base == 'python3': # Assume we installed python3 with brew on os x return os.path.join(os.path.dirname(dir), 'lib', 'mypy') +diff --git a/setup.py b/setup.py +index 89554a6..da62c0d 100644 --- a/setup.py +++ b/setup.py @@ -53,8 +53,6 @@ def find_data_files(base, globs): @@ -31,3 +35,6 @@ Skip installing the bundled typeshed data_files += find_data_files('xml', ['*.xsd', '*.xslt', '*.css']) classifiers = [ +-- +2.7.1 + diff --git a/0002-Canonicalize-bin_dir-when-looking-for-data_dir.patch b/0002-Canonicalize-bin_dir-when-looking-for-data_dir.patch index 83fba9c..937b94d 100644 --- a/0002-Canonicalize-bin_dir-when-looking-for-data_dir.patch +++ b/0002-Canonicalize-bin_dir-when-looking-for-data_dir.patch @@ -9,10 +9,12 @@ in /usr instead of /. mypy/build.py | 4 ++++ 1 file changed, 4 insertions(+) +diff --git a/mypy/build.py b/mypy/build.py +index 9f01b23..d79d0f5 100644 --- a/mypy/build.py +++ b/mypy/build.py -@@ -246,6 +246,10 @@ def default_data_dir(bin_dir: str) -> st - return subdir +@@ -222,6 +222,10 @@ def default_data_dir(bin_dir: str) -> str: + return os.path.join(lib, 'mypy') # Default to directory containing this file's parent. return parent + @@ -22,3 +24,6 @@ in /usr instead of /. base = os.path.basename(bin_dir) dir = os.path.dirname(bin_dir) if (sys.platform == 'win32' and base.lower() == 'scripts' +-- +2.7.1 + diff --git a/python3-mypy.spec b/python3-mypy.spec index a10fc3e..f35beb2 100644 --- a/python3-mypy.spec +++ b/python3-mypy.spec @@ -1,6 +1,6 @@ Name: python3-mypy # Last actual version was 0.2.0, which is 7805b2c, continues as 0.2.0_dev -Version: 0.4.1 +Version: 0.3.1 Release: 1 Summary: A static type checker for Python %{?python_provide:%python_provide python3-mypy} @@ -9,7 +9,7 @@ Summary: A static type checker for Python # package does not include those files License: MIT URL: https://github.com/python/mypy -Source0: v%{version}.tar.gz +Source0: mypy-lang-%{version}.tar.gz # doc files are missing from sdist, these are the copies from upstream github Source1: LICENSE @@ -40,7 +40,7 @@ type check them statically. Find bugs in your programs without even running them! %prep -%autosetup -n mypy-%{version} -p1 +%autosetup -n mypy-lang-%{version} -p1 cp %{SOURCE1} . cp %{SOURCE2} . cp %{SOURCE3} . @@ -76,9 +76,6 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} \ %{_prefix}/lib/mypy %changelog -* Sun May 15 2016 Matěj Cepl 0.4.1-1 -- Update to the last upstream release (#1333607) - * Mon Feb 22 2016 David Shea - 0.3.1-1 - Update to the first post-3.5 actual upstream release diff --git a/sources b/sources index ffe05fc..d90011c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -31169e5e2ef1f795bdfef04f203a3f6b v0.4.1.tar.gz +ef35f7fb86f4a8fca9b7292d0b03a443 mypy-lang-0.3.1.tar.gz