- removed MODULE_VERSION from path in querymodules.c - removed dependencies to shared pango libs from modules - supplied pango.modules

pango/pango.patch

@@ -119,3 +119,14 @@ Index: Makefile.in
  
  EXTRA_DIST = \
  	pango.pc.in		\
+Index: querymodules.c
+--- pango/querymodules.c.orig	2004-09-15 21:25:37.000000000 +0200
++++ pango/querymodules.c	2005-08-31 07:18:58.511568000 +0200
+@@ -214,7 +214,6 @@
+       path = pango_config_key_get ("Pango/ModulesPath");
+       if (!path)
+ 	path = g_build_filename (pango_get_lib_subdirectory (),
+-				 MODULE_VERSION,
+ 				 "modules",
+ 				 NULL);
+ 

pango/pango.spec

@@ -29,7 +29,7 @@
 
 #   package information
 Name:         pango
-Summary:      The GTK Accessability Toolkit
+Summary:      Layout And Rendering Of Internationalized Text
 URL:          http://www.pango.org/
 Vendor:       The Gtk Project
 Packager:     OpenPKG
@@ -38,7 +38,7 @@ Class:        PLUS
 Group:        XWindow
 License:      GPL
 Version:      %{V_pango}
-Release:      20050820
+Release:      20050903
 
 #   list of sources
 Source0:      ftp://ftp.gtk.org/pub/gtk/v%{V_gtk_major}/pango-%{V_pango}.tar.bz2
@@ -96,26 +96,40 @@ AutoReqProv:  no
         --with-x \
         --x-includes=`%{l_rc} --query x11_incdir` \
         --x-libraries=`%{l_rc} --query x11_libdir` \
-        --with-html-dir="%{l_prefix}/share" \
+        --with-html-dir="%{l_prefix}/doc" \
         --with-xml-catalog="%{l_prefix}/share/sgml/catalog.xml" \
         --disable-dependency-tracking \
         --disable-debug \
         --disable-rebuilds \
         --enable-shared \
         --enable-static
+
+    #   build pango libraries only statically
+    %{l_shtool} subst \
+        -e 's;^LIBRARY_LIBTOOL_OPTIONS = .*;\0 -static;' \
+        pango/Makefile
+
     %{l_make} %{l_mflags -O}
 
 %install
     rm -rf $RPM_BUILD_ROOT
     %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+    mkdir -p $RPM_BUILD_ROOT%{l_prefix}/doc
+
+    #   supply pango.modules
+    %{l_shtool} mkdir -f -p -m 755 \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/pango
+    $RPM_BUILD_ROOT%{l_prefix}/bin/pango-querymodules \
+        $RPM_BUILD_ROOT%{l_prefix}/lib/pango/modules/*.so \
+        | sed "s,$RPM_BUILD_ROOT,," \
+        >$RPM_BUILD_ROOT%{l_prefix}/etc/pango/pango.modules
+
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
     rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/*.la
     rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/*.s[ol]
     rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/*.s[ol].*
     rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/pango/modules/*.la
     rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/pango/modules/*.a
-    rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/gtk-doc
-    rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/pango
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
         '%config %{l_prefix}/etc/pango/*' \