[packages/xorg-cf-files] - fix libdir for x32 - rel 3

[baggins]

commit c9c4e7ff19783aff5cea973f2aaf4bec7ad67338
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Mar 12 07:59:16 2015 +0100

    - fix libdir for x32
    - rel 3

 xorg-cf-files-libx32.patch | 14 ++++++++++++++
 xorg-cf-files.spec         |  6 +++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
---
diff --git a/xorg-cf-files.spec b/xorg-cf-files.spec
index 75e07df..bab607b 100644
--- a/xorg-cf-files.spec
+++ b/xorg-cf-files.spec
@@ -2,13 +2,14 @@ Summary:	X.org cf files
 Summary(pl.UTF-8):	Pliki cf z X.org
 Name:		xorg-cf-files
 Version:	1.0.5
-Release:	2
+Release:	3
 License:	MIT
 Group:		X11/Development/Tools
 Source0:	http://xorg.freedesktop.org/releases/individual/util/%{name}-%{version}.tar.bz2
 # Source0-md5:	4a9cd7fc995ebf8f3cdad5395f9d8eba
 Patch0:		%{name}-mandir.patch
 Patch1:		%{name}-lib64.patch
+Patch2:		%{name}-libx32.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
@@ -35,6 +36,9 @@ bibliotek kiedyś dostarczanych w monolitycznych wydaniach X.Org.
 %if "%{_lib}" == "lib64"
 %patch1 -p1
 %endif
+%if "%{_lib}" == "libx32"
+%patch2 -p1
+%endif
 
 %build
 %{__aclocal}
diff --git a/xorg-cf-files-libx32.patch b/xorg-cf-files-libx32.patch
new file mode 100644
index 0000000..624f97d
--- /dev/null
+++ b/xorg-cf-files-libx32.patch
@@ -0,0 +1,14 @@
+--- xorg-cf-files-X11R7.0-1.0.1/X11.tmpl.orig	2006-04-17 13:03:34.000000000 +0200
++++ xorg-cf-files-X11R7.0-1.0.1/X11.tmpl	2006-04-17 13:05:22.000000000 +0200
+@@ -1461,9 +1461,9 @@
+ #endif
+ #ifndef LibDir
+ # ifdef ProjectRoot
+-#  define LibDir Concat(ProjectRoot,/lib/X11)
++#  define LibDir Concat(ProjectRoot,/libx32/X11)
+ # else
+-#  define LibDir /usr/lib/X11
++#  define LibDir /usr/libx32/X11
+ # endif
+ #endif
+ #ifndef ModuleDir
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-cf-files.git/commitdiff/c9c4e7ff19783aff5cea973f2aaf4bec7ad67338