Bump version.

3 files changed, 21 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index a6bf84488..097b69c5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 2006-05-30  Chris Lumens  <clumens@redhat.com>
 
-	* anaconda.spec:  Bump version.
+	* anaconda.spec:  Bump version.  Require glib2-devel.
+	
+	* loader2/Makefile:  Look for libglib2 in the right place on 64-bit
+	machines.
 
 2006-05-30  Chris Lumens  <clumens@redhat.com>
 
diff --git a/anaconda.spec b/anaconda.spec
index 4da493e5a..763a8d02d 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,12 +1,21 @@
 Name: anaconda
-Version: 11.1.0.22
+Version: 11.1.0.23
 Release: 1
 License: GPL
 Summary: Graphical system installer
 Group: Applications/System
 Source: anaconda-%{PACKAGE_VERSION}.tar.bz2
-BuildPreReq: pump-devel >= 0.8.20, kudzu-devel >= 1.2.0, pciutils-devel, bzip2-devel, e2fsprogs-devel, python-devel gtk2-devel rpm-python >= 4.2-0.61, newt-devel, rpm-devel, gettext >= 0.11, rhpl, booty, libxml2-python, zlib-devel, elfutils-devel, beecrypt-devel, libselinux-devel >= 1.6, libX11-devel, libXxf86misc-devel, intltool >= 0.31.2-3, python-urlgrabber, pykickstart, yum, device-mapper >= 1.01.05-3, libsepol-devel, pango-devel, pirut, libXt-devel, slang-devel >= 2.0.6-2
-Requires: rpm-python >= 4.2-0.61, rhpl >= 0.170, parted >= 1.6.3-7, booty, kudzu > 1.2.0, yum >= 2.5.1-3, pirut
+BuildPreReq: pump-devel >= 0.8.20, kudzu-devel >= 1.2.0, pciutils-devel
+BuildPreReq: bzip2-devel, e2fsprogs-devel, python-devel, gtk2-devel
+BuildPreReq: rpm-python >= 4.2-0.61, newt-devel, rpm-devel, gettext >= 0.11
+BuildPreReq: rhpl, booty, libxml2-python, zlib-devel, elfutils-devel
+BuildPreReq: beecrypt-devel, libselinux-devel >= 1.6, libX11-devel
+BuildPreReq: libXxf86misc-devel, intltool >= 0.31.2-3, python-urlgrabber
+BuildPreReq: pykickstart, yum, device-mapper >= 1.01.05-3, libsepol-devel
+BuildPreReq: pango-devel, pirut, libXt-devel, slang-devel >= 2.0.6-2
+BuildPreReq: glib2-devel >= 2.11.1-5
+Requires: rpm-python >= 4.2-0.61, rhpl >= 0.170, parted >= 1.6.3-7, booty
+Requires: kudzu > 1.2.0, yum >= 2.5.1-3, pirut
 Requires: pyparted, libxml2-python, python-urlgrabber
 Requires: system-logos, pykickstart
 Requires: device-mapper >= 1.01.05-3
@@ -79,6 +88,10 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
 
 %changelog
+* Tue May 30 2006 Chris Lumens <clumens@redhat.com> 11.1.0.23-1
+- Require glib2-devel.
+- Look for libglib in the right place on 64-bit machines.
+
 * Tue May 30 2006 Chris Lumens <clumens@redhat.com> 11.1.0.22-1
 - Fix going back in the UI.
 - Don't try to mount protected partitions twice.
diff --git a/loader2/Makefile b/loader2/Makefile
index efb951c15..60b58eef8 100644
--- a/loader2/Makefile
+++ b/loader2/Makefile
@@ -7,7 +7,7 @@ else
 TARGET=depend $(PROGS)
 endif
 
-GLIB   = /lib/libglib-2.0.a
+GLIB   = $(shell pkg-config --libs glib-2.0)
 CFLAGS += $(shell pkg-config --cflags glib-2.0)
 
 SLANGLIB = -lslang