[nordugrid-arc/el5: 2/2] Additional selinux contexts

[Mattias Ellert]

commit 28952bb980233d9b0c6cb5216f7098ee520fe61e
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Wed Jan 23 13:56:47 2013 +0100

    Additional selinux contexts
    
    - Fix for pythin wrappers using swig 2.0.9

 nordugrid-arc-swig-209.patch |   22 ++++++++++++++++++++++
 nordugrid-arc.spec           |   13 +++++++++++--
 2 files changed, 33 insertions(+), 2 deletions(-)
---
diff --git a/nordugrid-arc-swig-209.patch b/nordugrid-arc-swig-209.patch
new file mode 100644
index 0000000..751b8fd
--- /dev/null
+++ b/nordugrid-arc-swig-209.patch
@@ -0,0 +1,22 @@
+diff -ur nordugrid-arc-2.0.1.orig/swig/client.i nordugrid-arc-2.0.1/swig/client.i
+--- nordugrid-arc-2.0.1.orig/swig/client.i	2012-11-08 20:45:39.000000000 +0100
++++ nordugrid-arc-2.0.1/swig/client.i	2013-01-23 11:30:53.816961987 +0100
+@@ -265,15 +265,15 @@
+ %rename(_wait) Arc::EntityRetriever::wait;
+ #endif
+ %include "../src/hed/libs/client/EntityRetriever.h"
+-%template() Arc::EntityConsumer<Arc::Endpoint>;
++%template(EndpointConsumer) Arc::EntityConsumer<Arc::Endpoint>;
+ %template(EndpointContainer) Arc::EntityContainer<Arc::Endpoint>;
+ %template(ServiceEndpointQueryOptions) Arc::EndpointQueryOptions<Arc::Endpoint>;
+ %template(ServiceEndpointRetriever) Arc::EntityRetriever<Arc::Endpoint>;
+-%template() Arc::EntityConsumer<Arc::ComputingServiceType>;
++%template(ComputingServiceConsumer) Arc::EntityConsumer<Arc::ComputingServiceType>;
+ %template(ComputingServiceContainer) Arc::EntityContainer<Arc::ComputingServiceType>;
+ %template(ComputingServiceQueryOptions) Arc::EndpointQueryOptions<Arc::ComputingServiceType>;
+ %template(TargetInformationRetriever) Arc::EntityRetriever<Arc::ComputingServiceType>;
+-%template() Arc::EntityConsumer<Arc::Job>;
++%template(JobConsumer) Arc::EntityConsumer<Arc::Job>;
+ %template(JobContainer) Arc::EntityContainer<Arc::Job>;
+ %template(JobListQueryOptions) Arc::EndpointQueryOptions<Arc::Job>;
+ %template(JobListRetriever) Arc::EntityRetriever<Arc::Job>;
diff --git a/nordugrid-arc.spec b/nordugrid-arc.spec
index eae37de..1961000 100644
--- a/nordugrid-arc.spec
+++ b/nordugrid-arc.spec
@@ -60,6 +60,7 @@ 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}-swig-209.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 #		Packages dropped without replacements
@@ -102,8 +103,12 @@ BuildRequires:	lfc-devel
 %endif
 BuildRequires:	gridsite-devel
 %if %{with_xrootd}
+%if %{?fedora}%{!?fedora:0} >= 18 || %{?rhel}%{!?rhel:0} >= 7
+BuildRequires:	xrootd-client-devel
+%else
 BuildRequires:	xrootd-devel
 %endif
+%endif
 %if %{?fedora}%{!?fedora:0} >= 15 || %{?rhel}%{!?rhel:0} >= 7
 BuildRequires:	libdb-cxx-devel
 %else
@@ -522,6 +527,7 @@ fetch-crl tool in the fetch-crl package.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %if %{?fedora}%{!?fedora:0} <= 9 && %{?rhel}%{!?rhel:0} <= 5
 # Older versions of SELinux does not have policy for open
@@ -705,6 +711,7 @@ fi
 /sbin/chkconfig --add grid-infosys
 %if %{?fedora}%{!?fedora:0} >= 5 || %{?rhel}%{!?rhel:0} >= 5
 semanage port -a -t ldap_port_t -p tcp 2135 2>/dev/null || :
+semanage fcontext -a -t slapd_etc_t "/var/run/arc/bdii/bdii-slapd\.conf" 2>/dev/null || :
 semanage fcontext -a -t slapd_db_t "/var/lib/arc/bdii/db(/.*)?" 2>/dev/null || :
 semanage fcontext -a -t slapd_var_run_t "/var/run/arc/bdii/db(/.*)?" 2>/dev/null || :
 # Remove selinux labels for old arc bdii var dir
@@ -741,6 +748,7 @@ fi
 %if %{?fedora}%{!?fedora:0} >= 5 || %{?rhel}%{!?rhel:0} >= 5
 if [ $1 -eq 0 ]; then
   semanage port -d -t ldap_port_t -p tcp 2135 2>/dev/null || :
+  semanage fcontext -d -t slapd_etc_t "/var/run/arc/bdii/bdii-slapd\.conf" 2>/dev/null || :
   semanage fcontext -d -t slapd_db_t "/var/lib/arc/bdii/db(/.*)?" 2>/dev/null || :
   semanage fcontext -d -t slapd_var_run_t "/var/run/arc/bdii/db(/.*)?" 2>/dev/null || :
 fi
@@ -1160,8 +1168,9 @@ service fetch-crl-cron start > /dev/null 2>&1
 %defattr(-,root,root,-)
 
 %changelog
-* Wed Dec 19 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2.0.1-2
-- revbump after jnidir change
+* Wed Jan 23 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0.1-2
+- Additional selinux contexts
+- Fix for pythin wrappers using swig 2.0.9
 
 * Fri Nov 23 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0.1-1
 - 2.0.1 Final Release