correct broken assumed dynamic library configuration by hardcoding static library requirements into buildconf

gtk2/gtk2.spec

@@ -40,7 +40,7 @@ Class:        PLUS
 Group:        XWindow
 License:      GPL
 Version:      %{V_gtk}
-Release:      20050415
+Release:      20050419
 
 #   list of sources
 Source0:      ftp://ftp.gtk.org/pub/gtk/v%{V_gtk_major}/gtk+-%{V_gtk}.tar.gz
@@ -50,8 +50,8 @@ Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20040130
 PreReq:       OpenPKG, openpkg >= 20040130
-BuildPreReq:  X11, png, jpeg, tiff, gettext, pkgconfig >= 0.14.0, make
-PreReq:       X11, png, jpeg, tiff, gettext, pkgconfig >= 0.14.0
+BuildPreReq:  X11, png, jpeg, tiff, gettext, pango, pkgconfig >= 0.14.0, make
+PreReq:       X11, png, jpeg, tiff, gettext, pango, 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
@@ -83,10 +83,12 @@ AutoReqProv:  no
         gtk/xdgmime/Makefile.in \
         gdk/x11/Makefile.in
 
-    #   avoid searching for shared libraries
+    #   avoid searching for shared libraries,
+    #   and force pkg-config to provide static libs
     %{l_shtool} subst \
         -e 's;echo eval echo \\\$export_dynamic_flag_spec;;g' \
         -e 's;^\(LIBS="-lintl\)\ *\($LIBS"\);\1 -liconv \2;g' \
+        -e 's;\(PKG_CONFIG.*--libs\);\1 --static;g' \
         configure
 
     #   build binaries from static libraries

pango/pango.spec

@@ -38,7 +38,7 @@ Class:        PLUS
 Group:        XWindow
 License:      GPL
 Version:      %{V_pango}
-Release:      20050305
+Release:      20050419
 
 #   list of sources
 Source0:      ftp://ftp.gtk.org/pub/gtk/v%{V_gtk_major}/pango-%{V_pango}.tar.bz2
@@ -82,6 +82,9 @@ AutoReqProv:  no
         -e 's;\(pango_querymodules_LDFLAGS *=\);\1 -static;' \
         Makefile.in */Makefile.in */*/Makefile.in \
         pango\*.pc.in
+    %{l_shtool} subst \
+        -e 's;\(PKG_CONFIG.*--libs\);\1 --static;' \
+        configure
 
 %build
     CC="%{l_cc}" \