[nordugrid-arc/el5] Fix python module build logic

[Mattias Ellert]

commit 94a20f5985086fb64f0f52c9990f41319d35b440
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Tue Apr 16 21:53:17 2013 +0200

    Fix python module build logic

 nordugrid-arc-acix.patch |   26 ++++++++++++++++++++++++++
 nordugrid-arc.spec       |   11 +++++++++--
 2 files changed, 35 insertions(+), 2 deletions(-)
---
diff --git a/nordugrid-arc-acix.patch b/nordugrid-arc-acix.patch
new file mode 100644
index 0000000..a1358e5
--- /dev/null
+++ b/nordugrid-arc-acix.patch
@@ -0,0 +1,26 @@
+diff -ur nordugrid-arc-3.0.0.orig/configure.ac nordugrid-arc-3.0.0/configure.ac
+--- nordugrid-arc-3.0.0.orig/configure.ac	2013-02-19 20:18:51.070020000 +0100
++++ nordugrid-arc-3.0.0/configure.ac	2013-04-16 15:46:18.807545851 +0200
+@@ -2096,9 +2096,6 @@
+ # ACIX service
+ AC_ARG_ENABLE(acix, AC_HELP_STRING([--disable-acix], [disable building ACIX service]),
+   [enables_acix=$enableval],[])
+-if test "$enables_python" != "yes"; then
+-  enables_acix="no"
+-fi
+ AM_PATH_PYTHON([2.4], [], [enables_acix="no"])
+ AC_MSG_NOTICE([ACIX enabled: $enables_acix])
+ AM_CONDITIONAL([ACIX_ENABLED],[test "x$enables_acix" = "xyes"])
+diff -ur nordugrid-arc-3.0.0.orig/configure nordugrid-arc-3.0.0/configure
+--- nordugrid-arc-3.0.0.orig/configure	2013-02-22 23:53:50.987178283 +0100
++++ nordugrid-arc-3.0.0/configure	2013-04-16 15:45:56.432372028 +0200
+@@ -38381,9 +38381,6 @@
+   enableval=$enable_acix; enables_acix=$enableval
+ fi
+ 
+-if test "$enables_python" != "yes"; then
+-  enables_acix="no"
+-fi
+ 
+ 
+ 
diff --git a/nordugrid-arc.spec b/nordugrid-arc.spec
index 8a22687..90cf52f 100644
--- a/nordugrid-arc.spec
+++ b/nordugrid-arc.spec
@@ -77,12 +77,13 @@
 
 Name:		nordugrid-arc
 Version:	3.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}-acix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #		Packages dropped without replacements
@@ -422,7 +423,9 @@ Group:		System Environment/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	%{name}-hed = %{version}-%{release}
 Requires:	%{name}-plugins-needed = %{version}-%{release}
+%if %{with_python}
 Requires:	%{name}-python = %{version}-%{release}
+%endif
 Requires:	mktemp
 Requires:	python-twisted-core
 Requires:	python-twisted-web
@@ -723,6 +726,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
@@ -740,7 +744,7 @@ cd -
      --disable-lfc \
 %endif
 %if ! %{with_python}
-     --disable-python \
+     --disable-swig-python \
 %endif
 %if ! %{with_acix}
      --disable-acix \
@@ -1444,6 +1448,9 @@ service fetch-crl-cron start > /dev/null 2>&1
 %doc %{_mandir}/man1/saml_assertion_init.1*
 
 %changelog
+* Tue Apr 16 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0.0-2
+- Fix python module build logic
+
 * Mon Apr 15 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 3.0.0-1
 - 3.0.0 Final Release
 - Drop obsolete patches nordugrid-arc-swig-209.patch and