[root/el5/master] - Fix linking of Xlibs on ppc

[Mattias Ellert]

commit 46362f890d19108b6b33513269d5231d13b9e516
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Fri Jan 14 22:51:38 2011 +0100

    - Fix linking of Xlibs on ppc

 root-xlibs-ppc.patch |   24 ++++++++++++++++++++++++
 root.spec            |    8 +++++++-
 2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/root-xlibs-ppc.patch b/root-xlibs-ppc.patch
new file mode 100644
index 0000000..bc06cdd
--- /dev/null
+++ b/root-xlibs-ppc.patch
@@ -0,0 +1,24 @@
+diff -ur root-5.28.00.orig/config/Makefile.linuxppc64gcc root-5.28.00/config/Makefile.linuxppc64gcc
+--- root-5.28.00.orig/config/Makefile.linuxppc64gcc	2010-12-14 15:20:26.000000000 +0100
++++ root-5.28.00/config/Makefile.linuxppc64gcc	2011-01-14 20:53:19.298991959 +0100
+@@ -38,7 +38,7 @@
+ # System libraries:
+ SYSLIBS       = -lm -ldl $(OSTHREADLIBDIR) $(OSTHREADLIB) \
+                 $(ALLOCLIBDIR) $(ALLOCLIB)
+-XLIBS         = $(XPMLIBDIR) $(XPMLIB) $(X11LIBDIR) -lXext -lX11 -lSM -lICE
++XLIBS         = $(XPMLIBDIR) $(XPMLIB) $(X11LIBDIR) -lXext -lX11
+ CILIBS        = -lm -ldl
+ CRYPTLIBS     = -lcrypt
+ 
+diff -ur root-5.28.00.orig/config/Makefile.linuxppcgcc root-5.28.00/config/Makefile.linuxppcgcc
+--- root-5.28.00.orig/config/Makefile.linuxppcgcc	2010-12-14 15:20:26.000000000 +0100
++++ root-5.28.00/config/Makefile.linuxppcgcc	2011-01-14 20:52:57.826288692 +0100
+@@ -38,7 +38,7 @@
+ # System libraries:
+ SYSLIBS       = -lm -ldl $(OSTHREADLIBDIR) $(OSTHREADLIB) \
+                 $(ALLOCLIBDIR) $(ALLOCLIB)
+-XLIBS         = $(XPMLIBDIR) $(XPMLIB) $(X11LIBDIR) -lXext -lX11 -lSM -lICE
++XLIBS         = $(XPMLIBDIR) $(XPMLIB) $(X11LIBDIR) -lXext -lX11
+ CILIBS        = -lm -ldl
+ CRYPTLIBS     = -lcrypt
+ 
diff --git a/root.spec b/root.spec
index fbe8841..2fb340d 100644
--- a/root.spec
+++ b/root.spec
@@ -13,7 +13,7 @@
 Name:		root
 Version:	5.28.00
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	1%{?dist}
+Release:	1%{?dist}.1
 Summary:	Numerical data analysis framework
 
 Group:		Applications/Engineering
@@ -46,6 +46,8 @@ Patch3:		%{name}-unuran.patch
 Patch4:		%{name}-cern-ppc.patch
 #		Fix doc markup
 Patch5:		%{name}-htmldoc.patch
+#		Fix broken ppc link instructions
+Patch6:		%{name}-xlibs-ppc.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #		The build segfaults on ppc64 during an invocation of cint:
 #		https://savannah.cern.ch/bugs/index.php?70542
@@ -995,6 +997,7 @@ package to use root with GNU Emacs.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 find . '(' -name '*.cxx' -o -name '*.cpp' -o -name '*.C' -o -name '*.c' -o \
 	   -name '*.h' -o -name '*.hh' -o -name '*.hi' -o -name '*.py' -o \
@@ -2149,6 +2152,9 @@ fi
 %{emacs_lispdir}/root/*.el
 
 %changelog
+* Fri Jan 14 2011 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.28.00-1.1
+- Fix linking of Xlibs on ppc
+
 * Wed Dec 15 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 5.28.00-1
 - Update to 5.28.00
 - Drop patches fixed upstream: root-linker-scripts.patch, root-dpm-rfio.patch,