Keep glibconfig.h in /usr/lib

glib-2.11.1-libdir.patch

@@ -0,0 +1,29 @@
+--- glib-2.11.1/glib-2.0.pc.in.multilib	2006-05-25 10:17:11.000000000 -0400
++++ glib-2.11.1/glib-2.0.pc.in	2006-05-25 10:17:27.000000000 -0400
+@@ -11,5 +11,5 @@
+ Description: C Utility Library
+ Version: @VERSION@
+ Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ @ICONV_LIBS@
+-Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include 
++Cflags: -I${includedir}/glib-2.0 -I${prefix}/lib/glib-2.0/include 
+ 
+--- glib-2.11.1/Makefile.am.multilib	2006-05-25 10:16:15.000000000 -0400
++++ glib-2.11.1/Makefile.am	2006-05-25 10:17:00.000000000 -0400
+@@ -49,7 +49,7 @@
+ 	config.h.win32		\
+ 	gtk-doc.make
+ 
+-configexecincludedir = $(libdir)/glib-2.0/include
++configexecincludedir = $(prefix)/lib/glib-2.0/include
+ #configexecinclude_DATA = glibconfig.h
+ 
+ install-exec-local: glibconfig.h
+@@ -71,7 +71,7 @@
+ 	cd $(top_builddir) && $(SHELL) ./config.status glibconfig.h
+ 	echo timestamp > stamp-gc-h
+ 
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/lib/pkgconfig
+ pkgconfig_DATA = glib-2.0.pc gobject-2.0.pc gmodule-2.0.pc gmodule-export-2.0.pc gmodule-no-export-2.0.pc gthread-2.0.pc
+ 
+ $(pkgconfig_DATA): config.status

glib2.spec

@@ -3,12 +3,13 @@
 Summary: A library of handy utility functions
 Name: glib2
 Version: 2.11.1
-Release: 2
+Release: 3
 License: LGPL
 Group: System Environment/Libraries
 Source: glib-%{version}.tar.bz2
 Source2: glib2.sh
 Source3: glib2.csh
+Patch0: glib-2.11.1-libdir.patch
 Conflicts: libgnomeui <= 2.2.0
 BuildRoot: %{_tmppath}/glib-%{PACKAGE_VERSION}-root
 BuildRequires: pkgconfig >= 0.8
@@ -39,6 +40,7 @@ version 2 of the GLib library.
 
 %prep
 %setup -q -n glib-%{version}
+%patch0 -p1 -b .libdir
 
 %build
 
@@ -63,11 +65,6 @@ install -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 
 rm -f $RPM_BUILD_ROOT%{libdir}/*.{a,la}
 
-# we install in /lib now, but the pkgconfig files still go in /usr/lib
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
-mv $RPM_BUILD_ROOT%{libdir}/pkgconfig/*.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig
-
-
 %find_lang glib20
 
 %clean
@@ -91,7 +88,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root)
 
 %{libdir}/lib*.so
-%{libdir}/glib-2.0
+%{_libdir}/glib-2.0
 %{_includedir}/*
 %{_datadir}/aclocal/*
 %{_datadir}/gtk-doc/
@@ -101,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Thu May 25 2006 Matthias Clasen <mclasen@redhat.com> - 2.11.1-3
+- Keep glibconfig.h in /usr/lib
+
 * Mon May 22 2006 Matthias Clasen <mclasen@redhat.com> - 2.11.1-2
 - Move glib to /lib