Author: baggins Date: Sun May 14 19:59:55 2006 GMT Module: SPECS Tag: AC-branch ---- Log message: - merged from HEAD
---- Files affected: SPECS: pango.spec (1.137 -> 1.137.2.1) ---- Diffs: ================================================================ Index: SPECS/pango.spec diff -u SPECS/pango.spec:1.137 SPECS/pango.spec:1.137.2.1 --- SPECS/pango.spec:1.137 Sat Feb 18 17:02:06 2006 +++ SPECS/pango.spec Sun May 14 21:59:50 2006 @@ -9,25 +9,25 @@ Summary(pl): System renderowania międzynarodowego tekstu Summary(pt_BR): Sistema para layout e renderizaçăo de texto internacionalizado Name: pango -Version: 1.10.3 +Version: 1.12.2 Release: 1 Epoch: 1 License: LGPL Group: X11/Libraries -Source0: ftp://ftp.gtk.org/pub/gtk/v2.8/%{name}-%{version}.tar.bz2 -# Source0-md5: 6fc5097f9c10d90ed386e074cb22cf6f +Source0: http://ftp.gnome.org/pub/gnome/sources/pango/1.12/%{name}-%{version}.tar.bz2 +# Source0-md5: f41488236baf881a4844216ac61abc24 Patch0: %{name}-xfonts.patch Patch1: %{name}-arch_confdir.patch URL: http://www.pango.org/ BuildRequires: XFree86-devel -BuildRequires: autoconf >= 2.54 +BuildRequires: autoconf >= 2.59-9 BuildRequires: automake >= 1:1.7 BuildRequires: cairo-devel >= 1.0.0 BuildRequires: docbook-dtd412-xml BuildRequires: docbook-style-xsl BuildRequires: fontconfig-devel >= 1.0.1 BuildRequires: freetype-devel >= 2.1.7 -BuildRequires: glib2-devel >= 1:2.8.0 +BuildRequires: glib2-devel >= 1:2.10.1 %{?with_apidocs:BuildRequires: gtk-doc >= 1.0} BuildRequires: gtk-doc-automake >= 1.0 BuildRequires: libtool >= 1:1.4.2-9 @@ -38,7 +38,7 @@ Requires(post): /sbin/ldconfig Requires: cairo >= 1.0.0 Requires: freetype >= 2.1.7 -Requires: glib2 >= 1:2.8.0 +Requires: glib2 >= 1:2.10.1 Obsoletes: libpango24 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -117,6 +117,18 @@ Pango é um sistema para layout e renderizaçăo de texto internacionalizado. +%package apidocs +Summary: Pango API documentation +Summary(pl): Dokumentacja API pango +Group: Documentation +Requires: gtk-doc-common + +%description apidocs +Pango API documentation. + +%description apidocs -l pl +Dokumentacja API pango. + %prep %setup -q %patch0 -p1 @@ -148,7 +160,7 @@ > $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.4.0/modules/*.{la,a} +rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/1.5.0/modules/*.{la,a} %clean rm -rf $RPM_BUILD_ROOT @@ -175,11 +187,12 @@ %defattr(644,root,root,755) %doc AUTHORS NEWS README examples/HELLO.utf8 %attr(755,root,root) %{_bindir}/pango-querymodules +%attr(755,root,root) %{_bindir}/pango-view %attr(755,root,root) %{_libdir}/lib*.so.*.* %dir %{_libdir}/pango -%dir %{_libdir}/pango/1.4.0 -%dir %{_libdir}/pango/1.4.0/modules -%attr(755,root,root) %{_libdir}/pango/1.4.0/modules/*basic*.so +%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 %if %{with arch_confdir} %dir %{_sysconfdir}/pango-%{_host_cpu} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pango-%{_host_cpu}/pangox.aliases @@ -193,12 +206,11 @@ %files devel %defattr(644,root,root,755) -%doc ChangeLog TODO +%doc ChangeLog %attr(755,root,root) %{_libdir}/libpango*.so %{_libdir}/libpango*.la %{_pkgconfigdir}/* %{_includedir}/* -%{?with_apidocs:%{_gtkdocdir}/pango} %if %{with static_libs} %files static @@ -208,8 +220,14 @@ %files modules %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/pango/1.4.0/modules/*.so -%exclude %{_libdir}/pango/1.4.0/modules/*basic*.so +%attr(755,root,root) %{_libdir}/pango/1.5.0/modules/*.so +%exclude %{_libdir}/pango/1.5.0/modules/*basic*.so + +%if %{with apidocs} +%files apidocs +%defattr(644,root,root,755) +%{_gtkdocdir}/pango +%endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -217,6 +235,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.137.2.1 2006/05/14 19:59:50 baggins +- merged from HEAD + Revision 1.137 2006/02/18 16:02:06 qboosh - dropped xlibs patch ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/pango.spec?r1=1.137&r2=1.137.2.1&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
