back out pkgconfig implicit dynamic library workaround now that we've solved the problem within pkgconfig itself

ethereal/ethereal.spec

@@ -33,7 +33,7 @@ Class:        EVAL
 Group:        Network
 License:      GPL
 Version:      0.10.10
-Release:      20050419
+Release:      20050420
 
 #   package options
 %option       with_zlib    yes
@@ -97,9 +97,6 @@ AutoReqProv:  no
         -e 's;-all-static *;;g' \
         -e 's;-static *;;g' \
         Makefile.in
-    %{l_shtool} subst \
-        -e 's;\(PKG_CONFIG --libs\);\1 --static;g' \
-        configure
 
 %build
     CC="%{l_cc}" \

gimp/gimp.spec

@@ -70,9 +70,6 @@ AutoReqProv:  no
 
 %prep
     %setup -q
-    %{l_shtool} subst \
-        -e 's;\(PKG_CONFIG.*--libs\);\1 --static;g' \
-        configure
 
 %build
     #   configure program

glibmm/glibmm.spec

@@ -65,9 +65,6 @@ AutoReqProv:  no
 
 %prep
     %setup -q
-    %{l_shtool} subst \
-        -e 's;\(PKG_CONFIG.*--libs\);\1 --static;' \
-        configure
 
 %build
     CC="%{l_cc}" \

gtk2/gtk2.spec

@@ -83,12 +83,10 @@ AutoReqProv:  no
         gtk/xdgmime/Makefile.in \
         gdk/x11/Makefile.in
 
-    #   avoid searching for shared libraries,
-    #   and force pkg-config to provide static libs
+    #   avoid searching for shared libraries
     %{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

gtkmm/gtkmm.spec

@@ -73,9 +73,6 @@ AutoReqProv:  no
         -e 's;^\(SUBDIRS.*\)examples *;\1;g' \
         -e 's;^\(SUBDIRS.*\)tests *;\1;g' \
         Makefile.in
-    %{l_shtool} subst \
-        -e 's;\(PKG_CONFIG.*--libs\);\1 --static;' \
-        configure
 
 %build
     CC="%{l_cc}" \

pango/pango.spec

@@ -38,7 +38,7 @@ Class:        PLUS
 Group:        XWindow
 License:      GPL
 Version:      %{V_pango}
-Release:      20050419
+Release:      20050420
 
 #   list of sources
 Source0:      ftp://ftp.gtk.org/pub/gtk/v%{V_gtk_major}/pango-%{V_pango}.tar.bz2
@@ -82,9 +82,6 @@ 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}" \

xrender/xrender.spec

@@ -70,10 +70,8 @@ AutoReqProv:  no
     %setup -q -c
     %setup -q -T -D -a 1
     %{l_shtool} subst \
-        -e 's;\(PKG_CONFIG.*--libs\);\1 --static;g' \
         -e 's;echo \$RENDER_PKG_ERRORS;succeeded=yes;g' \
-        libXrender-%{V_xrender}/configure \
-        renderext-%{V_render}/configure
+        libXrender-%{V_xrender}/configure
 
 %build
     ( cd renderext-%{V_render}