rpms/pango/devel pango.spec,1.97,1.98

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Jan 11 21:41:19 UTC 2007


Author: besfahbo

Update of /cvs/dist/rpms/pango/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13616

Modified Files:
	pango.spec 
Log Message:
* Thu Jan 11 2007 Behdad Esfahbod <besfahbo at redhat.com> - 1.15.3-3
- Undo the posttrans change.  That's a no no.  We now regenerate the module
  file in postun if there are any other pango versions left.  This should
  take care of the problem in the future.




Index: pango.spec
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- pango.spec	11 Jan 2007 21:31:04 -0000	1.97
+++ pango.spec	11 Jan 2007 21:41:12 -0000	1.98
@@ -7,7 +7,7 @@
 
 Summary: System for layout and rendering of internationalized text
 Name: pango
-Version: 1.15.3
+Version: 1.15.4
 Release: 3%{?dist}
 License: LGPL
 Group: System Environment/Libraries
@@ -141,7 +141,6 @@
 %post
 /sbin/ldconfig
 
-%posttrans
 umask 0022
 # Deriving /etc/pango/$host location
 #
@@ -165,7 +164,35 @@
    ;;
 esac
 
-%postun -p /sbin/ldconfig
+%postun
+/sbin/ldconfig
+
+if test $1 -gt 0; then
+
+umask 0022
+# Deriving /etc/pango/$host location
+#
+# autoconf changes linux to linux-gnu
+case "%{_host}" in
+  *linux) host="%{_host}-gnu"
+  ;;
+  *) host="%{_host}"
+  ;;
+esac
+
+# autoconf uses powerpc not ppc
+host=`echo $host | sed "s/^ppc/powerpc/"`
+
+case "$host" in
+  alpha*|ia64*|powerpc64*|s390x*|x86_64*)
+   %{_bindir}/pango-querymodules-64 > %{_sysconfdir}/pango/$host/pango.modules || :
+   ;;
+  *)
+   %{_bindir}/pango-querymodules-32 > %{_sysconfdir}/pango/$host/pango.modules || :
+   ;;
+esac
+
+fi
 
 %files -f modules.files
 %defattr(-, root, root)
@@ -191,6 +218,11 @@
 
 %changelog
 * Thu Jan 11 2007 Behdad Esfahbod <besfahbo at redhat.com> - 1.15.3-3
+- Undo the posttrans change.  That's a no no.  We now regenerate the module
+  file in postun if there are any other pango versions left.  This should
+  take care of the problem in the future.
+
+* Thu Jan 11 2007 Behdad Esfahbod <besfahbo at redhat.com> - 1.15.3-3
 - Move pango.modules generation to posttrans, to make sure modules available
   in an older version but not this one are removed.
 - Resolves #222217




More information about the fedora-cvs-commits mailing list