- updated to 1.16.0; merged changes from DEVEL

Changed files:
    pango.spec -> 1.169

diff --git a/pango.spec b/pango.spec
index d02d1cf131bd4bc930e8b3dff2cf2535c0ac49fc..376ee81a318f31b681260c03e3a1b127b7b2c3c7 100644 (file)
--- a/pango.spec
+++ b/pango.spec
@@ -11,33 +11,33 @@ Summary:    System for layout and rendering of internationalized text
 Summary(pl.UTF-8):     System renderowania międzynarodowego tekstu
 Summary(pt_BR.UTF-8):  Sistema para layout e renderização de texto internacionalizado
 Name:          pango
-Version:       1.14.10
+Version:       1.16.0
 Release:       1
 Epoch:         1
 License:       LGPL
 Group:         X11/Libraries
-Source0:       http://ftp.gnome.org/pub/gnome/sources/pango/1.14/%{name}-%{version}.tar.bz2
-# Source0-md5: e9fc2f8168e74e2fa0aa8238ee0e9c06
+Source0:       http://ftp.gnome.org/pub/gnome/sources/pango/1.16/%{name}-%{version}.tar.bz2
+# Source0-md5: 3ff23998479e98c5dd9a7eaf08f6249d
 Patch0:                %{name}-xfonts.patch
 Patch1:                %{name}-arch_confdir.patch
 URL:           http://www.pango.org/
 BuildRequires: autoconf >= 2.59-9
-BuildRequires: automake >= 1:1.7
-BuildRequires: cairo-devel >= 1.2.4
+BuildRequires: automake >= 1:1.9
+BuildRequires: cairo-devel >= 1.2.6
 BuildRequires: docbook-dtd412-xml
 BuildRequires: docbook-style-xsl
 BuildRequires: fontconfig-devel >= 1:2.4.0
 BuildRequires: freetype-devel >= 2.1.7
 BuildRequires: glib2-devel >= 1:2.12.9
-%{?with_apidocs:BuildRequires: gtk-doc >= 1.7}
-BuildRequires: gtk-doc-automake >= 1.7
+%{?with_apidocs:BuildRequires: gtk-doc >= 1.8}
+BuildRequires: gtk-doc-automake >= 1.8
 BuildRequires: libtool >= 1:1.4.2-9
 BuildRequires: perl-base
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.197
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXft-devel >= 2.1.0
-Requires:      cairo >= 1.2.4
+Requires:      cairo >= 1.2.6
 Requires:      freetype >= 2.1.7
 Requires:      glib2 >= 1:2.12.9
 Obsoletes:     libpango24
@@ -59,7 +59,7 @@ Summary(pl.UTF-8):    System obsługi i renderowania międzynarodowego tekstu
 Summary(pt_BR.UTF-8):  Sistema para layout e renderização de texto internacionalizado
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
-Requires:      cairo-devel >= 1.2.4
+Requires:      cairo-devel >= 1.2.6
 Requires:      freetype-devel >= 2.1.7
 Requires:      glib2-devel >= 1:2.12.9
 Requires:      xorg-lib-libX11-devel
@@ -160,7 +160,7 @@ rm -rf $RPM_BUILD_ROOT
 > $RPM_BUILD_ROOT%{_sysconfdir}/pango%{?with_arch_confdir:-%{_host_cpu}}/pango.modules
 
 # useless (modules loaded through libgmodule)
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/1.5.0/modules/*.{la,a}
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/1.6.0/modules/*.{la,a}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -185,14 +185,19 @@ exit 0
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS NEWS README examples/HELLO.utf8
+%doc AUTHORS ChangeLog HACKING NEWS README THANKS
 %attr(755,root,root) %{_bindir}/pango-querymodules
 %attr(755,root,root) %{_bindir}/pango-view
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_libdir}/libpango-1.0.so.*.*.*
+%attr(755,root,root) %{_libdir}/libpangocairo-1.0.so.*.*.*
+%attr(755,root,root) %{_libdir}/libpangoft2-1.0.so.*.*.*
+%attr(755,root,root) %{_libdir}/libpangox-1.0.so.*.*.*
+%attr(755,root,root) %{_libdir}/libpangoxft-1.0.so.*.*.*
 %dir %{_libdir}/pango
-%dir %{_libdir}/pango/1.5.0
-%dir %{_libdir}/pango/1.5.0/modules
-%attr(755,root,root) %{_libdir}/pango/1.5.0/modules/*basic*.so
+%dir %{_libdir}/pango/1.6.0
+%dir %{_libdir}/pango/1.6.0/modules
+%attr(755,root,root) %{_libdir}/pango/1.6.0/modules/pango-basic-fc.so
+%attr(755,root,root) %{_libdir}/pango/1.6.0/modules/pango-basic-x.so
 %if %{with arch_confdir}
 %dir %{_sysconfdir}/pango-%{_host_cpu}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pango-%{_host_cpu}/pangox.aliases
@@ -202,26 +207,51 @@ exit 0
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pango/pangox.aliases
 %ghost %{_sysconfdir}/pango/pango.modules
 %endif
-%{_mandir}/man1/*
+%{_mandir}/man1/pango-querymodules.1*
 
 %files devel
 %defattr(644,root,root,755)
-%doc ChangeLog
-%attr(755,root,root) %{_libdir}/libpango*.so
-%{_libdir}/libpango*.la
-%{_pkgconfigdir}/*
-%{_includedir}/*
+%attr(755,root,root) %{_libdir}/libpango-1.0.so
+%attr(755,root,root) %{_libdir}/libpangocairo-1.0.so
+%attr(755,root,root) %{_libdir}/libpangoft2-1.0.so
+%attr(755,root,root) %{_libdir}/libpangox-1.0.so
+%attr(755,root,root) %{_libdir}/libpangoxft-1.0.so
+%{_libdir}/libpango-1.0.la
+%{_libdir}/libpangocairo-1.0.la
+%{_libdir}/libpangoft2-1.0.la
+%{_libdir}/libpangox-1.0.la
+%{_libdir}/libpangoxft-1.0.la
+%{_pkgconfigdir}/pango.pc
+%{_pkgconfigdir}/pangocairo.pc
+%{_pkgconfigdir}/pangoft2.pc
+%{_pkgconfigdir}/pangox.pc
+%{_pkgconfigdir}/pangoxft.pc
+%{_includedir}/pango-1.0
 
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libpango*.a
+%{_libdir}/libpango-1.0.a
+%{_libdir}/libpangocairo-1.0.a
+%{_libdir}/libpangoft2-1.0.a
+%{_libdir}/libpangox-1.0.a
+%{_libdir}/libpangoxft-1.0.a
 %endif
 
 %files modules
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/pango/1.5.0/modules/*.so
-%exclude %{_libdir}/pango/1.5.0/modules/*basic*.so
+%attr(755,root,root) %{_libdir}/pango/1.6.0/modules/pango-arabic-fc.so
+%attr(755,root,root) %{_libdir}/pango/1.6.0/modules/pango-arabic-lang.so
+%attr(755,root,root) %{_libdir}/pango/1.6.0/modules/pango-hangul-fc.so
+%attr(755,root,root) %{_libdir}/pango/1.6.0/modules/pango-hebrew-fc.so
+%attr(755,root,root) %{_libdir}/pango/1.6.0/modules/pango-indic-fc.so
+%attr(755,root,root) %{_libdir}/pango/1.6.0/modules/pango-indic-lang.so
+%attr(755,root,root) %{_libdir}/pango/1.6.0/modules/pango-khmer-fc.so
+%attr(755,root,root) %{_libdir}/pango/1.6.0/modules/pango-syriac-fc.so
+%attr(755,root,root) %{_libdir}/pango/1.6.0/modules/pango-thai-fc.so
+%attr(755,root,root) %{_libdir}/pango/1.6.0/modules/pango-tibetan-fc.so
+%exclude %{_libdir}/pango/1.6.0/modules/pango-basic-fc.so
+%exclude %{_libdir}/pango/1.6.0/modules/pango-basic-x.so
 
 %if %{with apidocs}
 %files apidocs