ellert pushed to nordugrid-arc (el5). "Fix python build conditionals"

notifications at fedoraproject.org notifications at fedoraproject.org
Sun Mar 29 12:10:51 UTC 2015 

>From 59c12710d9c02c42259c317ee74461abf155d166 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Sun, 29 Mar 2015 14:10:06 +0200
Subject: Fix python build conditionals


diff --git a/nordugrid-arc-pytest.patch b/nordugrid-arc-pytest.patch
new file mode 100644
index 0000000..3975a7d
--- /dev/null
+++ b/nordugrid-arc-pytest.patch
@@ -0,0 +1,145 @@
+diff -ur nordugrid-arc-5.0.0.orig/configure nordugrid-arc-5.0.0/configure
+--- nordugrid-arc-5.0.0.orig/configure	2015-03-27 23:17:36.545449332 +0100
++++ nordugrid-arc-5.0.0/configure	2015-03-29 12:12:49.776174284 +0200
+@@ -21522,14 +21522,6 @@
+     { $as_echo "$as_me:$LINENO: Missing Python - skipping Python components" >&5
+ $as_echo "$as_me: Missing Python - skipping Python components" >&6;}
+     enables_python=no
+-  elif test "X$PYTHON_LIBS" = "X"; then
+-    { $as_echo "$as_me:$LINENO: Missing Python library - skipping Python components" >&5
+-$as_echo "$as_me: Missing Python library - skipping Python components" >&6;}
+-    enables_python=no
+-  elif test "X$pythonh" != "Xyes"; then
+-    { $as_echo "$as_me:$LINENO: Missing Python header - skipping Python components" >&5
+-$as_echo "$as_me: Missing Python header - skipping Python components" >&6;}
+-    enables_python=no
+   elif test "X$PYTHON_SITE_ARCH" = "X" || test "X$PYTHON_SITE_LIB" = "X"; then
+     { $as_echo "$as_me:$LINENO: Missing python site packages location - skipping Python components" >&5
+ $as_echo "$as_me: Missing python site packages location - skipping Python components" >&6;}
+@@ -21543,6 +21535,14 @@
+     { $as_echo "$as_me:$LINENO: Missing Python - skipping Python bindings" >&5
+ $as_echo "$as_me: Missing Python - skipping Python bindings" >&6;}
+     enables_swig_python=no
++  elif test "X$PYTHON_LIBS" = "X"; then
++    { $as_echo "$as_me:$LINENO: Missing Python library - skipping Python bindings" >&5
++$as_echo "$as_me: Missing Python library - skipping Python bindings" >&6;}
++    enables_swig_python=no
++  elif test "X$pythonh" != "Xyes"; then
++    { $as_echo "$as_me:$LINENO: Missing Python header - skipping Python bindings" >&5
++$as_echo "$as_me: Missing Python header - skipping Python bindings" >&6;}
++    enables_swig_python=no
+   elif ! test -f python/arc_wrap.cpp && test "x$enables_swig_python" != "xyes"; then
+     { $as_echo "$as_me:$LINENO: Missing pre-compiled Python wrapper and SWIG - skipping Python bindings" >&5
+ $as_echo "$as_me: Missing pre-compiled Python wrapper and SWIG - skipping Python bindings" >&6;}
+@@ -21581,7 +21581,7 @@
+   PYTHON_SWIG_ENABLED_FALSE=
+ fi
+ 
+- if test "x$enables_python" = "xyes" &&
++ if test "x$enables_swig_python" = "xyes" &&
+                                  test "x$enables_python_service" = "xyes"; then
+   PYTHON_SERVICE_TRUE=
+   PYTHON_SERVICE_FALSE='#'
+diff -ur nordugrid-arc-5.0.0.orig/configure.ac nordugrid-arc-5.0.0/configure.ac
+--- nordugrid-arc-5.0.0.orig/configure.ac	2014-12-11 20:09:42.290198000 +0100
++++ nordugrid-arc-5.0.0/configure.ac	2015-03-29 12:10:00.236348091 +0200
+@@ -640,12 +640,6 @@
+   if test "X$PYTHON" = "X"; then
+     AC_MSG_NOTICE([Missing Python - skipping Python components])
+     enables_python=no
+-  elif test "X$PYTHON_LIBS" = "X"; then
+-    AC_MSG_NOTICE([Missing Python library - skipping Python components])
+-    enables_python=no
+-  elif test "X$pythonh" != "Xyes"; then
+-    AC_MSG_NOTICE([Missing Python header - skipping Python components])
+-    enables_python=no
+   elif test "X$PYTHON_SITE_ARCH" = "X" || test "X$PYTHON_SITE_LIB" = "X"; then
+     AC_MSG_NOTICE([Missing python site packages location - skipping Python components])
+     enables_python=no
+@@ -656,6 +650,12 @@
+   if test "x$enables_python" != "xyes"; then
+     AC_MSG_NOTICE([Missing Python - skipping Python bindings])
+     enables_swig_python=no
++  elif test "X$PYTHON_LIBS" = "X"; then
++    AC_MSG_NOTICE([Missing Python library - skipping Python bindings])
++    enables_swig_python=no
++  elif test "X$pythonh" != "Xyes"; then
++    AC_MSG_NOTICE([Missing Python header - skipping Python bindings])
++    enables_swig_python=no
+   elif ! test -f python/arc_wrap.cpp && test "x$enables_swig_python" != "xyes"; then
+     AC_MSG_NOTICE([Missing pre-compiled Python wrapper and SWIG - skipping Python bindings])
+     enables_swig_python=no
+@@ -670,7 +670,7 @@
+ AM_CONDITIONAL([PYTHON_ENABLED],[test "x$enables_python" = "xyes"])
+ AM_CONDITIONAL([PYTHON3], [test "x$enables_python" = "xyes" && test "x$PYTHON_MAJOR" = "x3"])
+ AM_CONDITIONAL([PYTHON_SWIG_ENABLED],[test "x$enables_swig_python" = "xyes"])
+-AM_CONDITIONAL([PYTHON_SERVICE],[test "x$enables_python" = "xyes" &&
++AM_CONDITIONAL([PYTHON_SERVICE],[test "x$enables_swig_python" = "xyes" &&
+                                  test "x$enables_python_service" = "xyes"])
+ 
+ # Alternative Python
+diff -ur nordugrid-arc-5.0.0.orig/python/test/Makefile.in nordugrid-arc-5.0.0/python/test/Makefile.in
+--- nordugrid-arc-5.0.0.orig/python/test/Makefile.in	2015-03-27 23:17:40.027501606 +0100
++++ nordugrid-arc-5.0.0/python/test/Makefile.in	2015-03-29 07:28:21.963376241 +0200
+@@ -390,13 +390,13 @@
+ @ALTPYTHON_ENABLED_TRUE at ALTPYTHON_DIR = altpython
+ DIST_SUBDIRS = python altpython
+ SUBDIRS = python $(ALTPYTHON_DIR)
+-TESTSCRIPTS = \
+-        DeletingSwigIteratorObtainedFromPublicListRegTest.py \
+-        UsingTheNextMethodOnASwigIteratorRegTest.py \
+-        JobSupervisorTest.py EndpointContainerTest.py \
+-        EndpointTest.py ServiceEndpointRetrieverTest.py \
+-        TargetInformationRetrieverTest.py \
+-        MappingOf_time_t_and_uint32_t_CTypesToPythonRegressionTest.py
++ at PYTHON_SWIG_ENABLED_TRUE@TESTSCRIPTS = \
++ at PYTHON_SWIG_ENABLED_TRUE@        DeletingSwigIteratorObtainedFromPublicListRegTest.py \
++ at PYTHON_SWIG_ENABLED_TRUE@        UsingTheNextMethodOnASwigIteratorRegTest.py \
++ at PYTHON_SWIG_ENABLED_TRUE@        JobSupervisorTest.py EndpointContainerTest.py \
++ at PYTHON_SWIG_ENABLED_TRUE@        EndpointTest.py ServiceEndpointRetrieverTest.py \
++ at PYTHON_SWIG_ENABLED_TRUE@        TargetInformationRetrieverTest.py \
++ at PYTHON_SWIG_ENABLED_TRUE@        MappingOf_time_t_and_uint32_t_CTypesToPythonRegressionTest.py
+ 
+ AUXFILES = testutils.py
+ EXTRA_DIST = $(TESTSCRIPTS) $(AUXFILES) common.mk
+diff -ur nordugrid-arc-5.0.0.orig/python/test/tests.mk nordugrid-arc-5.0.0/python/test/tests.mk
+--- nordugrid-arc-5.0.0.orig/python/test/tests.mk	2013-11-13 19:36:24.271138000 +0100
++++ nordugrid-arc-5.0.0/python/test/tests.mk	2015-03-29 07:26:27.802384489 +0200
+@@ -1,3 +1,4 @@
++if PYTHON_SWIG_ENABLED
+ TESTSCRIPTS = \
+         DeletingSwigIteratorObtainedFromPublicListRegTest.py \
+         UsingTheNextMethodOnASwigIteratorRegTest.py \
+@@ -5,5 +6,6 @@
+         EndpointTest.py ServiceEndpointRetrieverTest.py \
+         TargetInformationRetrieverTest.py \
+         MappingOf_time_t_and_uint32_t_CTypesToPythonRegressionTest.py
++endif
+ 
+ AUXFILES = testutils.py
+diff -ur nordugrid-arc-5.0.0.orig/src/hed/acc/Makefile.am nordugrid-arc-5.0.0/src/hed/acc/Makefile.am
+--- nordugrid-arc-5.0.0.orig/src/hed/acc/Makefile.am	2012-04-06 12:56:31.832846000 +0200
++++ nordugrid-arc-5.0.0/src/hed/acc/Makefile.am	2015-03-29 11:07:38.600955456 +0200
+@@ -4,7 +4,7 @@
+ ARC0 =
+ endif
+ 
+-if PYTHON_ENABLED
++if PYTHON_SWIG_ENABLED
+ PYTHONBROKER = PythonBroker
+ else
+ PYTHONBROKER =
+diff -ur nordugrid-arc-5.0.0.orig/src/hed/acc/Makefile.in nordugrid-arc-5.0.0/src/hed/acc/Makefile.in
+--- nordugrid-arc-5.0.0.orig/src/hed/acc/Makefile.in	2015-03-27 23:17:41.815528449 +0100
++++ nordugrid-arc-5.0.0/src/hed/acc/Makefile.in	2015-03-29 11:08:43.575735930 +0200
+@@ -387,8 +387,8 @@
+ ws_monitor_prefix = @ws_monitor_prefix@
+ @GRIDFTP_ENABLED_FALSE at ARC0 = 
+ @GRIDFTP_ENABLED_TRUE at ARC0 = ARC0
+- at PYTHON_ENABLED_FALSE@PYTHONBROKER = 
+- at PYTHON_ENABLED_TRUE@PYTHONBROKER = PythonBroker
++ at PYTHON_SWIG_ENABLED_FALSE@PYTHONBROKER = 
++ at PYTHON_SWIG_ENABLED_TRUE@PYTHONBROKER = PythonBroker
+ @UNICORE_ENABLED_FALSE at UNICORE = 
+ @UNICORE_ENABLED_TRUE at UNICORE = UNICORE
+ @EMIES_ENABLED_FALSE at EMIES = 
diff --git a/nordugrid-arc.spec b/nordugrid-arc.spec
index 1b55398..57286dd 100644
--- a/nordugrid-arc.spec
+++ b/nordugrid-arc.spec
@@ -93,12 +93,13 @@
 
 Name:		nordugrid-arc
 Version:	5.0.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Advanced Resource Connector Grid Middleware
 Group:		System Environment/Daemons
 License:	ASL 2.0
 URL:		http://www.nordugrid.org/
 Source:		http://download.nordugrid.org/packages/%{name}/releases/%{version}/src/%{name}-%{version}.tar.gz
+Patch0:		%{name}-pytest.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #		Packages dropped without replacements
@@ -759,6 +760,7 @@ developers.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %if %{?fedora}%{!?fedora:0} <= 9 && %{?rhel}%{!?rhel:0} <= 5
 # Older versions of SELinux does not have policy for open
@@ -1312,7 +1314,6 @@ service fetch-crl-cron start > /dev/null 2>&1
 %dir %{_localstatedir}/spool/arc
 %dir %{_localstatedir}/spool/arc/ssm
 %dir %{_localstatedir}/spool/arc/urs
-%if %{with_python}
 %{_libexecdir}/%{pkgdir}/ssmsend
 %dir %{_datadir}/%{pkgdir}/ssm
 %{_datadir}/%{pkgdir}/ssm/__init__.py*
@@ -1320,7 +1321,6 @@ service fetch-crl-cron start > /dev/null 2>&1
 %{_datadir}/%{pkgdir}/ssm/ssm2.py*
 %{_datadir}/%{pkgdir}/ssm/brokers.py*
 %{_datadir}/%{pkgdir}/ssm/sender.cfg
-%endif
 
 %if %{with_acix}
 %files acix-core
@@ -1478,6 +1478,9 @@ service fetch-crl-cron start > /dev/null 2>&1
 %doc %{_mandir}/man1/arcperftest.1*
 
 %changelog
+* Sun Mar 29 2015 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0.0-2
+- Fix python build conditionals
+
 * Sat Mar 28 2015 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.0.0-1
 - 5.0.0 Final Release
 - Drop patches nordugrid-arc-init.patch, -sedfix.patch and -python-print.patch
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/nordugrid-arc.git/commit/?h=el5&id=59c12710d9c02c42259c317ee74461abf155d166

More information about the scm-commits mailing list