Author: megabajt Date: Tue Jan 8 18:35:17 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 1.18.4 - changed pango-querymodules name. It has hardcoded LIBDIR and we should be able to install both versions, 32-bit and 64-bit.
---- Files affected: SPECS: pango.spec (1.182 -> 1.183) ---- Diffs: ================================================================ Index: SPECS/pango.spec diff -u SPECS/pango.spec:1.182 SPECS/pango.spec:1.183 --- SPECS/pango.spec:1.182 Tue Oct 16 18:43:46 2007 +++ SPECS/pango.spec Tue Jan 8 19:35:11 2008 @@ -9,13 +9,13 @@ 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.18.3 +Version: 1.18.4 Release: 1 Epoch: 1 License: LGPL v2+ Group: X11/Libraries Source0: http://ftp.gnome.org/pub/GNOME/sources/pango/1.18/%{name}-%{version}.tar.bz2 -# Source0-md5: 4a9862b5151f16dcad8e30dd6ef08549 +# Source0-md5: 5f4a24eb03789746a13e41beb7044776 Patch0: %{name}-xfonts.patch Patch1: %{name}-arch_confdir.patch URL: http://www.pango.org/ @@ -44,8 +44,10 @@ %if "%{_lib}" != "lib" %define _sysconfdir /etc/%{name}64 +%define _pqext -64 %else %define _sysconfdir /etc/%{name} +%define _pqext -32 %endif %description @@ -179,6 +181,13 @@ cp examples/*.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} +# We need to have 32-bit and 64-bit pango-querymodules binaries +# as they have hardcoded LIBDIR. +# (needed when multilib is used) +mv $RPM_BUILD_ROOT%{_bindir}/pango-querymodules{,%{_pqext}} +# fix man page too +mv $RPM_BUILD_ROOT%{_mandir}/man1/pango-querymodules{,%{_pqext}}.1 + # useless (modules loaded through libgmodule) rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/1.6.0/modules/*.{la,a} @@ -188,25 +197,25 @@ %post /sbin/ldconfig umask 022 -%{_bindir}/pango-querymodules > %{_sysconfdir}/pango.modules +%{_bindir}/pango-querymodules%{_pqext} > %{_sysconfdir}/pango.modules exit 0 %postun -p /sbin/ldconfig %post modules umask 022 -%{_bindir}/pango-querymodules > %{_sysconfdir}/pango.modules +%{_bindir}/pango-querymodules%{_pqext} > %{_sysconfdir}/pango.modules exit 0 %postun modules umask 022 -%{_bindir}/pango-querymodules > %{_sysconfdir}/pango.modules +%{_bindir}/pango-querymodules%{_pqext} > %{_sysconfdir}/pango.modules exit 0 %files %defattr(644,root,root,755) %doc AUTHORS ChangeLog HACKING NEWS README THANKS -%attr(755,root,root) %{_bindir}/pango-querymodules +%attr(755,root,root) %{_bindir}/pango-querymodules%{_pqext} %attr(755,root,root) %{_bindir}/pango-view %attr(755,root,root) %{_libdir}/libpango-1.0.so.*.*.* %attr(755,root,root) %{_libdir}/libpangocairo-1.0.so.*.*.* @@ -221,7 +230,7 @@ %dir %{_sysconfdir} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pangox.aliases %ghost %{_sysconfdir}/pango.modules -%{_mandir}/man1/pango-querymodules.1* +%{_mandir}/man1/pango-querymodules%{_pqext}.1* %files devel %defattr(644,root,root,755) @@ -286,6 +295,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.183 2008-01-08 18:35:11 megabajt +- updated to 1.18.4 +- changed pango-querymodules name. It has hardcoded LIBDIR and we should be + able to install both versions, 32-bit and 64-bit. + Revision 1.182 2007-10-16 16:43:46 megabajt - updated to 1.18.3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/pango.spec?r1=1.182&r2=1.183&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
