- revert debian python detection hacks that cause misdetection in PLD

- rel 4

diff --git a/automake.spec b/automake.spec
index 82151350ea57bba57008b301c43247ff3d430a43..93dfdb4769446f52ba0d3bf8871d0ed636e247b0 100644 (file)
--- a/automake.spec
+++ b/automake.spec
@@ -15,7 +15,7 @@ Summary(tr.UTF-8):    Makefile yapılandırma araçları
 Summary(uk.UTF-8):     GNU automake - інструменти для автоматичної генерації Makefile'ів
 Name:          automake
 Version:       1.15
-Release:       3
+Release:       4
 Epoch:         1
 License:       GPL v2+
 Group:         Development/Building
@@ -26,6 +26,7 @@ Patch1:               %{name}-man.patch
 Patch2:                %{name}-no_versioned_dir.patch
 Patch3:                %{name}-morearchs.patch
 Patch4:                automake-1.15-perl-escape-curly-bracket.patch
+Patch5:                revert-debian-python-hacks.patch
 URL:           http://sources.redhat.com/automake/
 BuildRequires: autoconf >= 2.69
 %if %{without bootstrap}
@@ -109,6 +110,7 @@ Makefile'ів.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %if %{without bootstrap}
 # prepare temporary copy of m4 dir without amversion.m4 (which causes automake version check)

diff --git a/revert-debian-python-hacks.patch b/revert-debian-python-hacks.patch
new file mode 100644 (file)
index 0000000..b394452
--- /dev/null
+++ b/revert-debian-python-hacks.patch
@@ -0,0 +1,70 @@
+commit 46c4205e82efcaf1165df8593eaeb2115eef3056
+Author: Jan Rękorajski <baggins@pld-linux.org>
+Date:   Sun Apr 24 10:28:38 2016 +0200
+
+    Revert "python: make installed modules find by default on Debian and Ubuntu"
+    
+    This reverts commit 1f113f6bc81edabbbda7e14d58b10ac02d7a1137.
+
+diff --git a/m4/python.m4 b/m4/python.m4
+index 32c30e2..5c58851 100644
+--- a/m4/python.m4
++++ b/m4/python.m4
+@@ -106,25 +106,6 @@ AC_DEFUN([AM_PATH_PYTHON],
+     [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`])
+   AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])
+ 
+-  # Just factor out some code duplication.
+-  am_python_setup_sysconfig="\
+-import sys
+-# Prefer sysconfig over distutils.sysconfig, for better compatibility
+-# with python 3.x.  See automake bug#10227.
+-try:
+-    import sysconfig
+-except ImportError:
+-    can_use_sysconfig = 0
+-else:
+-    can_use_sysconfig = 1
+-# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs:
+-# <https://github.com/pypa/virtualenv/issues/118>
+-try:
+-    from platform import python_implementation
+-    if python_implementation() == 'CPython' and sys.version[[:3]] == '2.7':
+-        can_use_sysconfig = 0
+-except ImportError:
+-    pass"
+ 
+   dnl Set up 4 directories:
+ 
+@@ -141,14 +122,7 @@ except ImportError:
+      else
+        am_py_prefix=$prefix
+      fi
+-     am_cv_python_pythondir=`$PYTHON -c "
+-$am_python_setup_sysconfig
+-if can_use_sysconfig:
+-    sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
+-else:
+-    from distutils import sysconfig
+-    sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
+-sys.stdout.write(sitedir)"`
++     am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null`
+      case $am_cv_python_pythondir in
+      $am_py_prefix*)
+        am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
+@@ -183,14 +157,7 @@ sys.stdout.write(sitedir)"`
+      else
+        am_py_exec_prefix=$exec_prefix
+      fi
+-     am_cv_python_pyexecdir=`$PYTHON -c "
+-$am_python_setup_sysconfig
+-if can_use_sysconfig:
+-    sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'})
+-else:
+-    from distutils import sysconfig
+-    sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix')
+-sys.stdout.write(sitedir)"`
++     am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null`
+      case $am_cv_python_pyexecdir in
+      $am_py_exec_prefix*)
+        am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`