- Make XPM loader use /usr/share/X11/rgb.txt.

- Drop no longer needed multilib configure options.

imlib2-1.2.1-X11-path.patch

@@ -6,7 +6,7 @@ diff -Nur imlib2-1.2.1-orig/src/modules/loaders/loader_xpm.c imlib2-1.2.1/src/mo
     if (!rgb_txt)
  #ifndef __EMX__
 -      rgb_txt = fopen("/usr/X11R6/lib/X11/rgb.txt", "r");
-+      rgb_txt = fopen("/usr/lib/X11/rgb.txt", "r");
++      rgb_txt = fopen("/usr/share/X11/rgb.txt", "r");
  #else
        rgb_txt = fopen(__XOS2RedirRoot("/XFree86/lib/X11/rgb.txt"), "rt");
  #endif

imlib2.spec

@@ -1,7 +1,7 @@
 Summary:	Image loading, saving, rendering, and manipulation library
 Name:		imlib2
 Version:	1.2.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	BSD
 Group:		System Environment/Libraries
 URL:		http://www.enlightenment.org/Libraries/Imlib2/
@@ -55,10 +55,7 @@ asmopts="--disable-mmx --enable-amd64"
 %endif
 
 # Note: --disable-static doesn't work as of 1.2.1.
-%configure --disable-dependency-tracking \
-  --x-libraries=%{_prefix}/X11R6/%{_lib} \
-  --with-pic \
-  $asmopts
+%configure --disable-dependency-tracking --with-pic $asmopts
 
 make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
@@ -115,6 +112,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Nov 24 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.2.1-5
+- Make XPM loader use /usr/share/X11/rgb.txt.
+- Drop no longer needed multilib configure options.
+
 * Sun Nov 13 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.2.1-4
 - Adapt to modular X.Org (#172613).