SPECS (AC-branch): pango.spec - revised archdir patch so /etc/pang...

[glen]

Author: glen                         Date: Mon Oct 22 19:12:04 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- revised archdir patch so /etc/pango or /etc/pango64 is used; rel 3

---- Files affected:
SPECS:
   pango.spec (1.137.2.4.2.2 -> 1.137.2.4.2.3) 

---- Diffs:

================================================================
Index: SPECS/pango.spec
diff -u SPECS/pango.spec:1.137.2.4.2.2 SPECS/pango.spec:1.137.2.4.2.3
--- SPECS/pango.spec:1.137.2.4.2.2	Sat Oct 20 12:25:44 2007
+++ SPECS/pango.spec	Mon Oct 22 21:11:59 2007
@@ -2,14 +2,13 @@
 # Conditional build:
 %bcond_without	apidocs		# disable gtk-doc
 %bcond_without	static_libs	# don't build static library
-%bcond_without	arch_confdir	# build with arch-dependant config dir
 #
 Summary:	System for layout and rendering of internationalized text
 Summary(pl):	System renderowania miêdzynarodowego tekstu
 Summary(pt_BR):	Sistema para layout e renderização de texto internacionalizado
 Name:		pango
 Version:	1.12.4
-Release:	2
+Release:	3
 Epoch:		1
 License:	LGPL
 Group:		X11/Libraries
@@ -41,6 +40,12 @@
 Obsoletes:	libpango24
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%if "%{_lib}" != "lib"
+%define		_sysconfdir	/etc/%{name}64
+%else
+%define		_sysconfdir	/etc/%{name}
+%endif
+
 %description
 System for layout and rendering of internationalized text.
 
@@ -131,7 +136,7 @@
 %prep
 %setup -q
 %patch0 -p1
-%{?with_arch_confdir:%patch1 -p1}
+%patch1 -p1
 
 %build
 %{?with_apidocs:%{__gtkdocize}}
@@ -156,7 +161,7 @@
 	DESTDIR=$RPM_BUILD_ROOT \
 	pkgconfigdir=%{_pkgconfigdir}
 
-> $RPM_BUILD_ROOT%{_sysconfdir}/pango%{?with_arch_confdir:-%{_host_cpu}}/pango.modules
+> $RPM_BUILD_ROOT%{_sysconfdir}/pango.modules
 
 # useless (modules loaded through libgmodule)
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/1.5.0/modules/*.{la,a}
@@ -167,19 +172,19 @@
 %post
 /sbin/ldconfig
 umask 022
-%{_bindir}/pango-querymodules > %{_sysconfdir}/pango%{?with_arch_confdir:-%{_host_cpu}}/pango.modules
+%{_bindir}/pango-querymodules > %{_sysconfdir}/pango.modules
 exit 0
 
 %postun -p /sbin/ldconfig
 
 %post modules
 umask 022
-%{_bindir}/pango-querymodules > %{_sysconfdir}/pango%{?with_arch_confdir:-%{_host_cpu}}/pango.modules
+%{_bindir}/pango-querymodules > %{_sysconfdir}/pango.modules
 exit 0
 
 %postun modules
 umask 022
-%{_bindir}/pango-querymodules > %{_sysconfdir}/pango%{?with_arch_confdir:-%{_host_cpu}}/pango.modules
+%{_bindir}/pango-querymodules > %{_sysconfdir}/pango.modules
 exit 0
 
 %files
@@ -192,15 +197,9 @@
 %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
-%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
+%dir %{_sysconfdir}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pangox.aliases
+%ghost %{_sysconfdir}/pango.modules
 %{_mandir}/man1/*
 
 %files devel
@@ -234,6 +233,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.137.2.4.2.3  2007/10/22 19:11:59  glen
+- revised archdir patch so /etc/pango or /etc/pango64 is used; rel 3
+
 Revision 1.137.2.4.2.2  2007/10/20 10:25:44  glen
 - rel 2
 
================================================================

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