- Make XPM loader use /usr/lib/X11/rgb.txt instead of /usr/X11R6/...

imlib2-1.2.1-X11-path.patch

@@ -0,0 +1,12 @@
+diff -Nur imlib2-1.2.1-orig/src/modules/loaders/loader_xpm.c imlib2-1.2.1/src/modules/loaders/loader_xpm.c
+--- imlib2-1.2.1-orig/src/modules/loaders/loader_xpm.c	2005-05-18 07:26:16.000000000 +0200
++++ imlib2-1.2.1/src/modules/loaders/loader_xpm.c	2005-09-21 08:55:11.000000000 +0200
+@@ -66,7 +66,7 @@
+    /* look in rgb txt database */
+    if (!rgb_txt)
+ #ifndef __EMX__
+-      rgb_txt = fopen("/usr/X11R6/lib/X11/rgb.txt", "r");
++      rgb_txt = fopen("/usr/lib/X11/rgb.txt", "r");
+ #else
+       rgb_txt = fopen(__XOS2RedirRoot("/XFree86/lib/X11/rgb.txt"), "rt");
+ #endif

imlib2.spec

@@ -1,11 +1,12 @@
 Summary:	Image loading, saving, rendering, and manipulation library
 Name:		imlib2
 Version:	1.2.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	BSD
 Group:		System Environment/Libraries
 URL:		http://www.enlightenment.org/Libraries/Imlib2/
 Source0:	http://download.sf.net/enlightenment/%{name}-%{version}.tar.gz
+Patch0:		imlib2-1.2.1-X11-path.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	XFree86-devel libjpeg-devel libpng-devel libtiff-devel
 BuildRequires:	libungif-devel freetype-devel >= 2.1.9-4 libtool bzip2-devel
@@ -40,6 +41,7 @@ flexible.
 
 %prep
 %setup -q
+%patch0 -p1 -b .x11-path
 
 
 %build
@@ -112,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 21 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.1-3
+- Make XPM loader use /usr/lib/X11/rgb.txt instead of /usr/X11R6/...
+
 * Sun Aug 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.2.1-2
 - 1.2.1, patches applied/obsoleted upstream.
 - Improve summary and description, fix URL.