[piglit/el6] Make at least sanity tests run.

[Matej Cepl]

commit fc3e27ab2a2999f42732c95438d8337e562d52b4
Author: Matěj Cepl <mcepl at cepl.eu>
Date:   Sat Jan 31 14:21:45 2015 +0100

    Make at least sanity tests run.
    
    * Fix one more python 2.6 incompatibility
    * configure ld.conf path for the additional libraries.

 piglit-python-2_6.patch |   16 ++++++++++++++++
 piglit.spec             |   16 +++++++++++++++-
 2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/piglit-python-2_6.patch b/piglit-python-2_6.patch
index 22110c3..b708001 100644
--- a/piglit-python-2_6.patch
+++ b/piglit-python-2_6.patch
@@ -665,3 +665,19 @@ Index: piglit/framework/grouptools.py
          assert '\\' not in element, 'Groups are not paths and cannot contain \\'
          assert not element.startswith('/'), 'Groups cannot start with /'
 
+Index: piglit/framework/tests/backends_tests.py
+===================================================================
+--- piglit.orig/framework/tests/backends_tests.py
++++ piglit/framework/tests/backends_tests.py
+@@ -45,9 +45,10 @@ BACKEND_INITIAL_META = {
+     'name': 'name',
+     'test_count': 0,
+     'env': {},
+-    'options': {k: v for k, v in core.Options()},
++    'options': dict((k, v) for k, v in core.Options()),
+ }
+
++
+ JUNIT_SCHEMA = 'framework/tests/schema/junit-7.xsd'
+
+
diff --git a/piglit.spec b/piglit.spec
index 58b2031..eb9827a 100644
--- a/piglit.spec
+++ b/piglit.spec
@@ -1,6 +1,6 @@
 Name:           piglit
 Version:        1
-Release:        0.24.20150103GIT4adb082%{?dist}
+Release:        0.25.20150103GIT4adb082%{?dist}
 Summary:        Collection of automated tests for OpenGL implementations
 
 Group:          Development/Tools
@@ -57,15 +57,29 @@ make install DESTDIR=$RPM_BUILD_ROOT
 # We don't want this in its own doc directory.
 rm -rf $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}
 
+%if 0%{?rhel} > 0 && 0%{?rhel} <= 6
+LDCONFDIR=%{_sysconfdir}/ld.so.conf.d
+mkdir -p ${RPM_BUILD_ROOT}${LDCONFDIR}
+echo '%{_libdir}/%{name}/lib' \
+        > ${RPM_BUILD_ROOT}${LDCONFDIR}/piglit-%{_arch}.conf
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%if 0%{?rhel} > 0 && 0%{?rhel} <= 6
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+%endif
 
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
 %{_libdir}/%{name}/
+%if 0%{?rhel} > 0 && 0%{?rhel} <= 6
+%{_sysconfdir}/ld.so.conf.d/piglit-%{_arch}.conf
+%endif
 %doc README HACKING COPYING RELEASE licences/{GPL-2,GPL-3,LGPL-2} examples