diff -r 5ee40987cb02 -r e99334bd789c glib/glib.spec
--- a/glib/glib.spec	Fri Aug 03 15:15:17 2012 +0200
+++ b/glib/glib.spec	Fri Aug 03 15:16:43 2012 +0200
@@ -1,6 +1,6 @@
 ##
-##  glib2.spec -- OpenPKG RPM Package Specification
-##  Copyright (c) 2000-2010 OpenPKG Foundation e.V. <http://openpkg.net/>
+##  glib.spec -- OpenPKG RPM Package Specification
+##  Copyright (c) 2000-2012 OpenPKG Foundation e.V. <http://openpkg.net/>
 ##
 ##  Permission to use, copy, modify, and distribute this software for
 ##  any purpose with or without fee is hereby granted, provided that
@@ -22,11 +22,11 @@
 ##
 
 #   package version
-%define       V_glib2_major  2.25
-%define       V_glib2_minor  13
+%define       V_major  2.32
+%define       V_minor  3
 
 #   package information
-Name:         glib2
+Name:         glib
 Summary:      The Gtk Utility Library
 URL:          http://www.gtk.org/
 Vendor:       The Gtk Project
@@ -35,23 +35,21 @@
 Class:        BASE
 Group:        Algorithm
 License:      GPL
-Version:      %{V_glib2_major}.%{V_glib2_minor}
-Release:      20101020
+Version:      %{V_major}.%{V_minor}
+Release:      20120713
 
 #   package options
 %option       with_threads  yes
 
 #   list of sources
-Source0:      ftp://ftp.gnome.org/pub/gnome/sources/glib/%{V_glib2_major}/glib-%{version}.tar.gz
-Patch0:       glib2.patch
+Source0:      http://ftp.gnome.org/pub/gnome/sources/glib/%{V_major}/glib-%{version}.tar.xz
+Patch0:       glib.patch
 
 #   build information
-Prefix:       %{l_prefix}
-BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20100101, perl, make, pkgconfig
-PreReq:       OpenPKG, openpkg >= 20100101, perl
-BuildPreReq:  gettext, libiconv, pcre, pcre::with_utf8 = yes
-PreReq:       gettext, libiconv, pcre, pcre::with_utf8 = yes
+BuildPreReq:  OpenPKG, openpkg >= 20120101, perl, make
+PreReq:       OpenPKG, openpkg >= 20120101, perl
+BuildPreReq:  gettext, libiconv, pcre, pcre::with_utf8 = yes, libffi
+PreReq:       gettext, libiconv, pcre, pcre::with_utf8 = yes, libffi
 
 %description
     GLib is the low-level core library that originally was split out
@@ -60,9 +58,9 @@
     loop, threads, dynamic loading, and an object system.
 
 %track
-    prog glib2 = {
+    prog glib = {
         version   = %{version}
-        url       = ftp://ftp.gnome.org/pub/gnome/sources/glib/%{V_glib2_major}/
+        url       = http://ftp.gnome.org/pub/gnome/sources/glib/%{V_major}/
         regex     = glib-(__VER__)\.tar\.(gz|bz2)
     }
 
@@ -83,29 +81,29 @@
         -e 's;/gmodule-2\.0\.pc;/gmodule-x.x.pc;g' \
         -e 's;/gio-unix-2\.0\.pc;/gio-unix-x.x.pc;g' \
         -e 's;/gio-2\.0\.pc;/gio-x.x.pc;g' \
-        -e 's;/glib-2\.0;/glib2;g' \
-        -e 's;/gobject-2\.0;/gobject2;g' \
-        -e 's;/gthread-2\.0;/gthread2;g' \
-        -e 's;/gmodule-2\.0;/gmodule2;g' \
-        -e 's;/gio-unix-2\.0;/gio-unix2;g' \
-        -e 's;/gio-2\.0;/gio2;g' \
+        -e 's;/glib-2\.0;/glib;g' \
+        -e 's;/gobject-2\.0;/gobject;g' \
+        -e 's;/gthread-2\.0;/gthread;g' \
+        -e 's;/gmodule-2\.0;/gmodule;g' \
+        -e 's;/gio-unix-2\.0;/gio-unix;g' \
+        -e 's;/gio-2\.0;/gio;g' \
         -e 's;/glib-x\.x\.pc;/glib-2.0.pc;g' \
         -e 's;/gobject-x\.x\.pc;/gobject-2.0.pc;g' \
         -e 's;/gthread-x\.x\.pc;/gthread-2.0.pc;g' \
         -e 's;/gmodule-x\.x\.pc;/gmodule-2.0.pc;g' \
         -e 's;/gio-unix-x\.x\.pc;/gio-unix-2.0.pc;g' \
         -e 's;/gio-x\.x\.pc;/gio-2.0.pc;g' \
-        -e 's;lib\(g[a-z]*\)-2\.0;lib\12;g' \
+        -e 's;lib\(g[a-z]*\)-2\.0;lib\1;g' \
         `find . -name Makefile.in -print` \
         m4macros/glib-2.0.m4
     %{l_shtool} subst \
-        -e 's;/glib-2\.0;/glib2;g' \
-        -e 's;/gobject-2\.0;/gobject2;g' \
-        -e 's;/gthread-2\.0;/gthread2;g' \
-        -e 's;/gmodule-2\.0;/gmodule2;g' \
-        -e 's;/gio-unix-2\.0;/gio-unix2;g' \
-        -e 's;/gio-2\.0;/gio2;g' \
-        -e 's;-l\(g[a-z]*\)-2\.0;-l\12;g' \
+        -e 's;/glib-2\.0;/glib;g' \
+        -e 's;/gobject-2\.0;/gobject;g' \
+        -e 's;/gthread-2\.0;/gthread;g' \
+        -e 's;/gmodule-2\.0;/gmodule;g' \
+        -e 's;/gio-unix-2\.0;/gio-unix;g' \
+        -e 's;/gio-2\.0;/gio;g' \
+        -e 's;-l\(g[a-z]*\)-2\.0;-l\1;g' \
         *-2.0.pc.in
     libs=""
 %if "%{with_threads}" == "yes"
@@ -118,6 +116,10 @@
     CPPFLAGS="%{l_cppflags}" \
     LDFLAGS="%{l_ldflags}" \
     LIBS="$libs" \
+    LIBFFI_CFLAGS="%{l_cppflags}" \
+    LIBFFI_LIBS="%{l_ldflags} -lffi" \
+    PCRE_CFLAGS="%{l_cppflags pcre .}" \
+    PCRE_LIBS="%{l_ldflags} -lpcre" \
     PERL="%{l_prefix}/bin/perl" \
     PERL_PATH="%{l_prefix}/bin/perl" \
     GREP="grep" \
@@ -125,25 +127,22 @@
         --prefix=%{l_prefix} \
         --mandir=%{l_prefix}/man \
         --with-libiconv=gnu \
-        --disable-debug \
-        --disable-shared \
         --with-pcre=system \
 %if "%{with_threads}" == "yes"
-        --enable-threads \
-%else
-        --disable-threads \
+        --with-threads=posix \
 %endif
         --disable-gtk-doc \
-        --disable-dtrace
+        --disable-dtrace \
+        --disable-fam \
+        --disable-debug \
+        --disable-shared
 
     #   build package
     %{l_make} %{l_mflags}
 
 %install
-    rm -rf $RPM_BUILD_ROOT
-
     #   install package
-    %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
+    %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
 
     #   strip down installation
     rm -f  $RPM_BUILD_ROOT%{l_prefix}/info/dir
@@ -161,5 +160,4 @@
 %files -f files
 
 %clean
-    rm -rf $RPM_BUILD_ROOT