rpms/imlib2/devel imlib2-1.2.1-X11-path.patch, 1.1, 1.2 imlib2.spec, 1.17, 1.18

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/imlib2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17800

Modified Files:
	imlib2-1.2.1-X11-path.patch imlib2.spec 
Log Message:
* 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.


imlib2-1.2.1-X11-path.patch:

Index: imlib2-1.2.1-X11-path.patch
===================================================================
RCS file: /cvs/extras/rpms/imlib2/devel/imlib2-1.2.1-X11-path.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- imlib2-1.2.1-X11-path.patch	21 Sep 2005 07:02:28 -0000	1.1
+++ imlib2-1.2.1-X11-path.patch	25 Nov 2005 14:06:20 -0000	1.2
@@ -6,7 +6,7 @@
     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


Index: imlib2.spec
===================================================================
RCS file: /cvs/extras/rpms/imlib2/devel/imlib2.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- imlib2.spec	13 Nov 2005 12:39:55 -0000	1.17
+++ imlib2.spec	25 Nov 2005 14:06:42 -0000	1.18
@@ -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 @@
 %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 @@
 
 
 %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).