rpms/pango
7
0
Fork 0
Code Issues Pull Requests Releases Activity

auto-import changelog data from pango-1.2.5-3.0.src.rpm

Browse Source 
Mon Dec 08 2003 Owen Taylor <otaylor@redhat.com> 1.2.5-3.0
- Package pango-querymodules as pango-querymodules-{32,64}; look for
    pango.modules in an architecture-specific directory. (Fixes #111511,
    Justin M. Forbes)
Mon Sep 08 2003 Owen Taylor <otaylor@redhat.com> 1.2.5-2.0
- Fix problem with corrupt Thai shaper
This commit is contained in:
cvsdist 2004-09-09 09:52:22 +00:00
parent fdc49ab40c
commit 1cf4425bc9
2 changed files with 72 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pango-1.2.5-lib64.patch Normal file
View File

@ -0,0 +1,30 @@
--- pango-1.2.5/pango/Makefile.am.lib64 2003-08-25 10:12:45.000000000 -0400
+++ pango-1.2.5/pango/Makefile.am 2003-12-08 18:43:51.000000000 -0500
@@ -16,6 +16,7 @@
-DPANGO_ENABLE_BACKEND \
-DPANGO_ENABLE_ENGINE \
-DSYSCONFDIR=\"$(sysconfdir)\" \
+ -DHOST=\"$(host_triplet)\" \
-DLIBDIR=\"$(libdir)\" \
-DMODULE_VERSION=\"$(PANGO_MODULE_VERSION)\" \
-DG_DISABLE_DEPRECATED \
--- pango-1.2.5/pango/modules.c.lib64 2002-12-06 19:54:27.000000000 -0500
+++ pango-1.2.5/pango/modules.c 2003-12-08 18:43:51.000000000 -0500
@@ -353,6 +353,7 @@
if (!file_str)
file_str = g_build_filename (pango_get_sysconf_subdirectory (),
+ HOST,
"pango.modules",
NULL);
--- pango-1.2.5/pango/Makefile.in.lib64 2003-12-09 10:48:24.000000000 -0500
+++ pango-1.2.5/pango/Makefile.in 2003-12-09 10:48:32.000000000 -0500
@@ -135,6 +135,7 @@
-DPANGO_ENABLE_BACKEND \
-DPANGO_ENABLE_ENGINE \
-DSYSCONFDIR=\"$(sysconfdir)\" \
+ -DHOST=\"$(host_triplet)\" \
-DLIBDIR=\"$(libdir)\" \
-DMODULE_VERSION=\"$(PANGO_MODULE_VERSION)\" \
-DG_DISABLE_DEPRECATED \

46
pango.spec
View File

@ -8,7 +8,7 @@
Summary: System for layout and rendering of internationalized text.
Name: pango
Version: 1.2.5
Release: 1.1
Release: 3.0
License: LGPL
Group: System Environment/Libraries
Source: ftp://ftp.gtk.org/pub/gtk/v2.1/pango-%{version}.tar.bz2
@ -28,6 +28,10 @@ Obsoletes: pango-gtkbeta, fribidi-gtkbeta
Patch1: pango-slighthint.patch
Patch3: pango-1.0.99.020606-xfonts.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=121488
Patch4: pango-1.2.5-thai.patch
# Look for pango.modules in an arch-specific directory
Patch5: pango-1.2.5-lib64.patch
%description
Pango is a system for layout and rendering of internationalized text.
@ -55,6 +59,8 @@ pango.
%patch1 -p1 -b .slighthint
%patch3 -p1 -b .xfonts
%patch4 -p1 -b .thai
%patch5 -p1 -b .lib64
%build
@ -83,12 +89,35 @@ if ! test -e $PANGOXFT_SO; then
exit 1
fi
# We need to have separate 32-bit and 64-bit pango-querymodules binaries
# for places where we have two copies of the Pango libraries installed.
# (we might have x86_64 and i686 packages on the same system, for example.)
case "%{_host}" in
alpha*|ia64*|ppc64*|s390x*|x86_64*)
mv $RPM_BUILD_ROOT%{_bindir}/pango-querymodules $RPM_BUILD_ROOT%{_bindir}/pango-querymodules-64
;;
*)
mv $RPM_BUILD_ROOT%{_bindir}/pango-querymodules $RPM_BUILD_ROOT%{_bindir}/pango-querymodules-32
;;
esac
rm $RPM_BUILD_ROOT%{_sysconfdir}/pango/pango.modules
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pango/%{_host}
touch $RPM_BUILD_ROOT%{_sysconfdir}/pango/%{_host}/pango.modules
%clean
rm -rf $RPM_BUILD_ROOT
%post
/sbin/ldconfig
%{_bindir}/pango-querymodules > %{_sysconfdir}/pango/pango.modules
case "%{_host}" in
alpha*|ia64*|ppc64*|s390x*|x86_64*)
%{_bindir}/pango-querymodules-64 > %{_sysconfdir}/pango/%{_host}/pango.modules
;;
*)
%{_bindir}/pango-querymodules-32 > %{_sysconfdir}/pango/%{_host}/pango.modules
;;
esac
%postun -p /sbin/ldconfig
@ -97,11 +126,12 @@ rm -rf $RPM_BUILD_ROOT
%doc README AUTHORS COPYING ChangeLog TODO
%doc examples/HELLO.utf8
%{_libdir}/libpango*-*.so.*
%{_bindir}/pango-querymodules
%{_bindir}/pango-querymodules*
%{_libdir}/pango
%dir %{_sysconfdir}/pango
%config %{_sysconfdir}/pango/pangox.aliases
%ghost %{_sysconfdir}/pango/pango.modules
%dir %{_sysconfdir}/pango/%{_host}
%ghost %{_sysconfdir}/pango/%{_host}/pango.modules
%files devel
@ -113,6 +143,14 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Mon Dec 8 2003 Owen Taylor <otaylor@redhat.com> 1.2.5-3.0
- Package pango-querymodules as pango-querymodules-{32,64}; look for
pango.modules in an architecture-specific directory.
(Fixes #111511, Justin M. Forbes)
* Mon Sep 8 2003 Owen Taylor <otaylor@redhat.com> 1.2.5-2.0
- Fix problem with corrupt Thai shaper
* Wed Aug 27 2003 Owen Taylor <otaylor@redhat.com> 1.2.5-1.1
- Version 1.2.5