SPECS: pango.spec - added arch-dependant config dir support, bcond...

[sparky]

Author: sparky                       Date: Sat Dec 10 17:25:14 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added arch-dependant config dir support, bconded, default off

---- Files affected:
SPECS:
   pango.spec (1.134 -> 1.135) 

---- Diffs:

================================================================
Index: SPECS/pango.spec
diff -u SPECS/pango.spec:1.134 SPECS/pango.spec:1.135
--- SPECS/pango.spec:1.134	Sun Dec  4 23:34:26 2005
+++ SPECS/pango.spec	Sat Dec 10 18:25:05 2005
@@ -4,6 +4,7 @@
 %bcond_with	xlibs		# use pkgconfig to find libX11 CFLAGS
 %bcond_without	apidocs		# disable gtk-doc
 %bcond_without	static_libs	# don't build static library
+%bcond_with	arch_confdir	# build with arch-dependant config dir
 #
 Summary:	System for layout and rendering of internationalized text
 Summary(pl):	System renderowania międzynarodowego tekstu
@@ -18,6 +19,7 @@
 # Source0-md5:	7302220d93ac17d2c44f356d852e81dc
 Patch0:		%{name}-xfonts.patch
 Patch1:		%{name}-xlibs.patch
+Patch2:		%{name}-arch_confdir.patch
 URL:		http://www.pango.org/
 %{!?with_xlibs:BuildRequires:	XFree86-devel}
 BuildRequires:	autoconf >= 2.54
@@ -123,6 +125,7 @@
 %setup -q
 %patch0 -p1
 %{?with_xlibs:%patch1 -p1}
+%{?with_arch_confdir:%patch2 -p1}
 
 %build
 %{?with_apidocs:%{__gtkdocize}}
@@ -147,7 +150,7 @@
 	DESTDIR=$RPM_BUILD_ROOT \
 	pkgconfigdir=%{_pkgconfigdir}
 
-> $RPM_BUILD_ROOT%{_sysconfdir}/pango/pango.modules
+> $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}
@@ -158,19 +161,19 @@
 %post
 /sbin/ldconfig
 umask 022
-%{_bindir}/pango-querymodules > %{_sysconfdir}/pango/pango.modules
+%{_bindir}/pango-querymodules > %{_sysconfdir}/pango%{?with_arch_confdir:-%{_host_cpu}}/pango.modules
 exit 0
 
 %postun -p /sbin/ldconfig
 
 %post modules
 umask 022
-%{_bindir}/pango-querymodules > %{_sysconfdir}/pango/pango.modules
+%{_bindir}/pango-querymodules > %{_sysconfdir}/pango%{?with_arch_confdir:-%{_host_cpu}}/pango.modules
 exit 0
 
 %postun modules
 umask 022
-%{_bindir}/pango-querymodules > %{_sysconfdir}/pango/pango.modules
+%{_bindir}/pango-querymodules > %{_sysconfdir}/pango%{?with_arch_confdir:-%{_host_cpu}}/pango.modules
 exit 0
 
 %files
@@ -182,9 +185,15 @@
 %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
+%if %{with arch_confdir}
+%dir %{_sysconfdir}/pango-%{_host_cpu}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pango-%{_host_cpu}/pangox.aliases
+%ghost %{_sysconfdir}/pango-%{_host_cpu}/pango.modules
+%else
 %dir %{_sysconfdir}/pango
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pango/pangox.aliases
 %ghost %{_sysconfdir}/pango/pango.modules
+%endif
 %{_mandir}/man1/*
 
 %files devel
@@ -213,6 +222,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.135  2005/12/10 17:25:05  sparky
+- added arch-dependant config dir support, bconded, default off
+
 Revision 1.134  2005/12/04 22:34:26  glen
 - adapterized (sorted verify flags)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/pango.spec?r1=1.134&r2=1.135&f=u