diff --git a/healpy-1.10.3-unbundling.patch b/healpy-1.10.3-unbundling.patch deleted file mode 100644 index 26a589d..0000000 --- a/healpy-1.10.3-unbundling.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -Naur healpy-1.10.3/setup.py healpy-1.10.3.new/setup.py ---- healpy-1.10.3/setup.py 2016-11-08 17:15:57.000000000 +0100 -+++ healpy-1.10.3.new/setup.py 2017-04-07 16:09:58.321108387 +0200 -@@ -203,12 +203,7 @@ - build_clib.finalize_options(self) - env = self.env() - -- for lib_name, build_info in self.libraries: -- if 'sources' not in build_info: -- log.info("checking if configure script for library '%s' exists", lib_name) -- if not os.path.exists(os.path.join(build_info['local_source'], 'configure')): -- log.info("running 'autoreconf -i' for library '%s'", lib_name) -- check_call(['autoreconf', '-i'], cwd=build_info['local_source'], env=env) -+ pass - - def build_library(self, library, pkg_config_name, local_source=None, supports_non_srcdir_builds=True): - log.info("checking if library '%s' is installed", library) -@@ -317,12 +312,6 @@ - the 'local_sources' value are returned.""" - self.check_library_list(self.libraries) - filenames = [] -- for (lib_name, build_info) in self.libraries: -- sources = build_info.get('sources') -- if sources is None or not isinstance(sources, (list, tuple)): -- sources = list(self._list_files_recursive(build_info['local_source'])) -- -- filenames.extend(sources) - return filenames - - def build_libraries(self, libraries): -@@ -412,12 +401,9 @@ - packages=['healpy','healpy.test'], - libraries=[ - ('cfitsio', { -- 'pkg_config_name': 'cfitsio', -- 'local_source': 'cfitsio', -- 'supports_non_srcdir_builds': False}), -+ 'pkg_config_name': 'cfitsio'}), - ('healpix_cxx', { -- 'pkg_config_name': 'healpix_cxx >= 3.30.0', -- 'local_source': 'healpixsubmodule/src/cxx/autotools'}) -+ 'pkg_config_name': 'healpix_cxx >= 3.30.0'}) - ], - py_modules=['healpy.pixelfunc','healpy.sphtfunc', - 'healpy.visufunc','healpy.fitsfunc', diff --git a/healpy-1.12.0-unbundling.patch b/healpy-1.12.0-unbundling.patch new file mode 100644 index 0000000..40cda34 --- /dev/null +++ b/healpy-1.12.0-unbundling.patch @@ -0,0 +1,53 @@ +diff -Naur healpy-1.12.0/setup.py healpy-1.12.0.new/setup.py +--- healpy-1.12.0/setup.py 2018-06-12 22:58:59.000000000 +0200 ++++ healpy-1.12.0.new/setup.py 2018-06-19 10:20:02.132825605 +0200 +@@ -216,19 +216,8 @@ + configure script.""" + build_clib.finalize_options(self) + env = self.env() ++ pass + +- for lib_name, build_info in self.libraries: +- if "sources" not in build_info: +- log.info( +- "checking if configure script for library '%s' exists", lib_name +- ) +- if not os.path.exists( +- os.path.join(build_info["local_source"], "configure") +- ): +- log.info("running 'autoreconf -i' for library '%s'", lib_name) +- check_call( +- ["autoreconf", "-i"], cwd=build_info["local_source"], env=env +- ) + + def build_library( + self, +@@ -356,12 +345,6 @@ + the 'local_sources' value are returned.""" + self.check_library_list(self.libraries) + filenames = [] +- for (lib_name, build_info) in self.libraries: +- sources = build_info.get("sources") +- if sources is None or not isinstance(sources, (list, tuple)): +- sources = list(self._list_files_recursive(build_info["local_source"])) +- +- filenames.extend(sources) + return filenames + + def build_libraries(self, libraries): +@@ -451,15 +434,12 @@ + "cfitsio", + { + "pkg_config_name": "cfitsio", +- "local_source": "cfitsio", +- "supports_non_srcdir_builds": False, + }, + ), + ( + "healpix_cxx", + { + "pkg_config_name": "healpix_cxx >= 3.30.0", +- "local_source": "healpixsubmodule/src/cxx/autotools", + }, + ), + ], diff --git a/python-healpy.spec b/python-healpy.spec index edc228f..3c5a8f1 100644 --- a/python-healpy.spec +++ b/python-healpy.spec @@ -15,7 +15,7 @@ Summary: %{sum} License: GPLv2+ URL: https://pypi.python.org/pypi/%{srcname} Source0: https://files.pythonhosted.org/packages/source/h/%{srcname}/%{srcname}-%{version}.tar.gz -Patch0: %{srcname}-1.10.3-unbundling.patch +Patch0: %{srcname}-1.12.0-unbundling.patch # Upstream only supports 64 bit architectures, 32 Bit builds, but tests fail # and we don't want to provide a non reliable software.