SPECS: pango.spec - better pqext handling, w/o unnecessary -32 on ...

[qboosh]

Author: qboosh                       Date: Tue Jan  8 20:02:50 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- better pqext handling, w/o unnecessary -32 on single-ABI (and bogusz on pure-64bit) archs
- ghost soname symlinks

---- Files affected:
SPECS:
   pango.spec (1.183 -> 1.184) 

---- Diffs:

================================================================
Index: SPECS/pango.spec
diff -u SPECS/pango.spec:1.183 SPECS/pango.spec:1.184
--- SPECS/pango.spec:1.183	Tue Jan  8 19:35:11 2008
+++ SPECS/pango.spec	Tue Jan  8 21:02:45 2008
@@ -43,11 +43,12 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %if "%{_lib}" != "lib"
-%define		_sysconfdir	/etc/%{name}64
-%define		_pqext		-64
+%define		libext		%(echo "%{_lib}" | sed -e 's/^lib//')
+%define		_sysconfdir	/etc/%{name}%{libext}
+%define		pqext		-%{libext}
 %else
 %define		_sysconfdir	/etc/%{name}
-%define		_pqext		-32
+%define		pqext		%{nil}
 %endif
 
 %description
@@ -184,9 +185,9 @@
 # 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}}
+mv $RPM_BUILD_ROOT%{_bindir}/pango-querymodules{,%{pqext}}
 # fix man page too
-mv $RPM_BUILD_ROOT%{_mandir}/man1/pango-querymodules{,%{_pqext}}.1
+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}
@@ -197,31 +198,36 @@
 %post
 /sbin/ldconfig
 umask 022
-%{_bindir}/pango-querymodules%{_pqext} > %{_sysconfdir}/pango.modules
+%{_bindir}/pango-querymodules%{pqext} > %{_sysconfdir}/pango.modules
 exit 0
 
 %postun -p /sbin/ldconfig
 
 %post modules
 umask 022
-%{_bindir}/pango-querymodules%{_pqext} > %{_sysconfdir}/pango.modules
+%{_bindir}/pango-querymodules%{pqext} > %{_sysconfdir}/pango.modules
 exit 0
 
 %postun modules
 umask 022
-%{_bindir}/pango-querymodules%{_pqext} > %{_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%{_pqext}
+%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) %ghost %{_libdir}/libpango-1.0.so.0
 %attr(755,root,root) %{_libdir}/libpangocairo-1.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpangocairo-1.0.so.0
 %attr(755,root,root) %{_libdir}/libpangoft2-1.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpangoft2-1.0.so.0
 %attr(755,root,root) %{_libdir}/libpangox-1.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpangox-1.0.so.0
 %attr(755,root,root) %{_libdir}/libpangoxft-1.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpangoxft-1.0.so.0
 %dir %{_libdir}/pango
 %dir %{_libdir}/pango/1.6.0
 %dir %{_libdir}/pango/1.6.0/modules
@@ -230,7 +236,7 @@
 %dir %{_sysconfdir}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pangox.aliases
 %ghost %{_sysconfdir}/pango.modules
-%{_mandir}/man1/pango-querymodules%{_pqext}.1*
+%{_mandir}/man1/pango-querymodules%{pqext}.1*
 
 %files devel
 %defattr(644,root,root,755)
@@ -295,6 +301,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.184  2008-01-08 20:02:45  qboosh
+- better pqext handling, w/o unnecessary -32 on single-ABI (and bogusz on pure-64bit) archs
+- ghost soname symlinks
+
 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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/pango.spec?r1=1.183&r2=1.184&f=u