upgrading package: gtk2 2.2.4 -> 2.4.0

gtk2/gtk2.spec

@@ -24,11 +24,11 @@
 ##
 
 #   package version
-%define       V_gtk         2.2.4
-%define       V_gtk_major   2.2
-%define       V_glib_major  2.2
+%define       V_gtk         2.4.0
+%define       V_gtk_major   2.4
+%define       V_glib_major  2.4
 %define       V_pango_major 1.2
-%define       V_atk_major   1.2
+%define       V_atk_major   1.6
 
 #   package information
 Name:         gtk2
@@ -41,7 +41,7 @@ Class:        PLUS
 Group:        XWindow
 License:      GPL
 Version:      %{V_gtk}
-Release:      20040207
+Release:      20040329
 
 #   list of sources
 Source0:      ftp://ftp.gtk.org/pub/gtk/v%{V_gtk_major}/gtk+-%{V_gtk}.tar.gz
@@ -51,8 +51,8 @@ Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20040130
 PreReq:       OpenPKG, openpkg >= 20040130
-BuildPreReq:  X11, png, jpeg, tiff, gettext, make
-PreReq:       X11, png, jpeg, tiff, gettext
+BuildPreReq:  X11, png, jpeg, tiff, gettext, pkgconfig >= 0.14.0, make
+PreReq:       X11, png, jpeg, tiff, gettext, pkgconfig >= 0.14.0
 BuildPreReq:  glib2 >= %{V_glib_major}, pango >= %{V_pango_major}, atk >= %{V_atk_major}
 PreReq:       glib2 >= %{V_glib_major}, pango >= %{V_pango_major}, atk >= %{V_atk_major}
 AutoReq:      no
@@ -81,26 +81,30 @@ AutoReqProv:  no
         -e 's;^LIBS =.*;LIBS =;' \
         gdk-pixbuf/Makefile.in \
         gdk-pixbuf/pixops/Makefile.in \
+        gtk/xdgmime/Makefile.in \
         gdk/x11/Makefile.in
 
     #   avoid searching for shared libraries
     %{l_shtool} subst \
-        -e 's;\$export_dynamic_flag_spec;;g' \
+        -e 's;\\*\$export_dynamic_flag_spec;;g' \
         -e 's;\$lt_export_dynamic_flag_spec;;g' \
+        -e 's;^\(LIBS="-lintl\)\ *\($LIBS"\);\1 -liconv \2;g' \
         configure
 
     #   build binaries from static libraries
     %{l_shtool} subst \
         -e 's;\(gtk_demo_LDFLAGS *=\);\1 -static;' \
-        -e 's;\(gtk_demo_LDADD .*\);\1 -lintl;' \
+        demos/gtk-demo/Makefile.in
+    %{l_shtool} subst \
         -e 's;\(gtk_query_immodules_2_0_LDFLAGS *=\);\1 -static;' \
-        -e 's;\(gtk_query_immodules_2_0_LDADD .*\);\1 -lintl;' \
+        -e 's;^\(gtk_query_immodules_2_0_LDADD *=.*\);\1 -lpangoft2;' \
+        gtk/Makefile.in
+
+    %{l_shtool} subst \
         -e 's;\(gdk_pixbuf_csource_LDFLAGS *=\);\1 -static;' \
         -e 's;\(gdk_pixbuf_csource_LDADD .*\);\1 -lintl;' \
         -e 's;\(gdk_pixbuf_query_loaders_LDFLAGS *=\);\1 -static;' \
         -e 's;\(gdk_pixbuf_query_loaders_LDADD .*\);\1 -lintl;' \
-        demos/gtk-demo/Makefile.in \
-        gtk/Makefile.in \
         gdk-pixbuf/Makefile.in
 
     #   remove version from paths
@@ -132,16 +136,21 @@ AutoReqProv:  no
         po/Makefile.in.in
 
 %build
+    #   set x11 paths
+    xinc=`%{l_prefix}/etc/rc --query x11_incdir`
+    xlib=`%{l_prefix}/etc/rc --query x11_libdir`
+
     #   configure package
     CC="%{l_cc}" \
     CFLAGS="%{l_cflags -O}" \
-    CPPFLAGS="%{l_cppflags tiff}" \
+    CPPFLAGS="%{l_cppflags tiff} -I$xinc" \
     LDFLAGS="%{l_ldflags}" \
+    LIBS="-lpangoft2" \
     ./configure \
         --prefix=%{l_prefix} \
         --with-x \
-        --x-includes=`%{l_prefix}/etc/rc --query x11_incdir` \
-        --x-libraries=`%{l_prefix}/etc/rc --query x11_libdir` \
+        --x-includes=$xinc \
+        --x-libraries=$xlib \
         --with-glib-prefix=%{l_prefix} \
         --with-libpng=%{l_prefix} \
         --with-libjpeg=%{l_prefix} \