diff --git a/py-hla/Makefile b/py-hla/Makefile index 0776471f759c293c4f302a6729757ca28f2b74d2..fc3734bab940d6ec20294d742a543a3113a6f4f8 100644 --- a/py-hla/Makefile +++ b/py-hla/Makefile @@ -5,6 +5,7 @@ PKG_VERSION= 1.1.1 DISTNAME= PyHLA-${PKG_VERSION}-Source PKGNAME= ${PKGTAG.python}-hla-${PKG_VERSION} +PKGREVISION= 1 CATEGORIES= architecture MASTER_SITES= http://gnu.mirrors.pair.com/savannah/savannah//certi/contrib/PyHLA/ diff --git a/py-hla/distinfo b/py-hla/distinfo index 7caa177af3cd101af0e32618cb3a0852679f870a..06545349bec317cb11ea91e7abac9a073ca0ebd6 100644 --- a/py-hla/distinfo +++ b/py-hla/distinfo @@ -3,3 +3,4 @@ RMD160 (PyHLA-1.1.1-Source.tar.gz) = d2fdd7bbd9b5a45c1aa50aeaac3374fa9c465057 Size (PyHLA-1.1.1-Source.tar.gz) = 115908 bytes SHA1 (patch-aa) = 6de74707e22cb4225e3a47af92b6ea896831568a SHA1 (patch-ab) = 82665ec55ad932570223690030f33aeffe07350c +SHA1 (patch-ac) = 7d8f95a3318012762b5961f8a86528d4a9f1c7f0 diff --git a/py-hla/patches/patch-ac b/py-hla/patches/patch-ac new file mode 100644 index 0000000000000000000000000000000000000000..ffc17462441bf759ed315bd251753b4ab6d1a0c2 --- /dev/null +++ b/py-hla/patches/patch-ac @@ -0,0 +1,34 @@ +--- CMakeLists.txt.orig 2015-03-06 13:50:52.047439570 +0100 ++++ CMakeLists.txt 2015-03-06 13:54:32.655445126 +0100 +@@ -16,18 +16,11 @@ + + FIND_PACKAGE(PythonLibs REQUIRED) + FIND_PACKAGE(PythonInterp REQUIRED) +-EXECUTE_PROCESS( +- COMMAND "${PYTHON_EXECUTABLE}" "-V" +- ERROR_VARIABLE PYTHON_VERSION_STRING +- ERROR_STRIP_TRAILING_WHITESPACE) +-STRING( +- REGEX REPLACE "[A-Za-z\ ]*([0-9]+\\.[0-9]+\\.*[0-9]*)" "\\1" +- PYTHON_VERSION "${PYTHON_VERSION_STRING}") +-MESSAGE(STATUS "Using Python: ${PYTHON_VERSION}") ++MESSAGE(STATUS "Using Python: ${PYTHON_VERSION_STRING}") + SET(PYTHON_NEEDED_VERSION "2.5") +-IF("${PYTHON_VERSION}" VERSION_LESS "${PYTHON_NEEDED_VERSION}") +- message(FATAL_ERROR "You need at least Python ${PYTHON_NEEDED_VERSION}, found: ${PYTHON_VERSION}") +-ENDIF("${PYTHON_VERSION}" VERSION_LESS "${PYTHON_NEEDED_VERSION}") ++IF("${PYTHON_VERSION_STRING}" VERSION_LESS "${PYTHON_NEEDED_VERSION}") ++ message(FATAL_ERROR "You need at least Python ${PYTHON_NEEDED_VERSION}, found: ${PYTHON_VERSION_STRING}") ++ENDIF("${PYTHON_VERSION_STRING}" VERSION_LESS "${PYTHON_NEEDED_VERSION}") + + IF(NOT PYTHON_PACKAGES_PATH) + EXECUTE_PROCESS( +@@ -63,7 +56,7 @@ + IF (WIN32) + SET(CPACK_SOURCE_GENERATOR "ZIP") + SET(CPACK_GENERATOR "NSIS;ZIP") +- SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-win32-py${PYTHON_VERSION}") ++ SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-win32-py${PYTHON_VERSION_STRING}") + ELSE (WIN32) + SET(CPACK_SOURCE_GENERATOR "TGZ;ZIP") + SET(CPACK_GENERATOR "TGZ;ZIP;RPM")