From 4675b30af4f8b77a8c51def0ecd00076b1cfbad4 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Mon, 6 Jul 2009 05:14:30 +0000
Subject: [PATCH] use --with-runtime-libdir

---
 glib2.spec | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/glib2.spec b/glib2.spec
index 1a6c8ac..0edf1b5 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -3,7 +3,7 @@
 Summary: A library of handy utility functions
 Name: glib2
 Version: 2.21.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -52,7 +52,7 @@ of version 2 of the GLib library.
 %setup -q -n glib-%{version}
 
 %build
-%configure --disable-gtk-doc --enable-static
+%configure --disable-gtk-doc --enable-static --with-runtime-libdir=../../%{_lib}
 make %{?_smp_mflags}
 
 %install
@@ -60,16 +60,6 @@ rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# we build into /usr/lib, but we want the libraries (but not
-# the devel stuff) in /lib
-./mkinstalldirs $RPM_BUILD_ROOT/%{_lib}
-pushd $RPM_BUILD_ROOT%{_libdir}
-for name in glib gobject gmodule gthread gio; do
-  mv lib${name}-2.0.so.* ../../%{_lib}
-  ln -sf ../../%{_lib}/lib${name}-2.0.so.*.* lib${name}-2.0.so
-done
-popd
-
 ## glib2.sh and glib2.csh
 ./mkinstalldirs $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
@@ -117,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.a
 
 %changelog
+* Mon Jul  6 2009 Matthias Clasen <mclasen@redhat.com> - 2.21.3-2
+- Use --with-runtime-libdir
+
 * Mon Jul  6 2009 Matthias Clasen <mclasen@redhat.com> - 2.21.3-1
 - Update to 2.21.3