SPECS: pango.spec - revised archdir patch so /etc/pango or /etc/pa...

[glen]

Author: glen                         Date: Mon Jun 18 15:02:33 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- revised archdir patch so /etc/pango or /etc/pango64 is used; rel 2

---- Files affected:
SPECS:
   pango.spec (1.173 -> 1.174) 

---- Diffs:

================================================================
Index: SPECS/pango.spec
diff -u SPECS/pango.spec:1.173 SPECS/pango.spec:1.174
--- SPECS/pango.spec:1.173	Thu May  3 14:15:16 2007
+++ SPECS/pango.spec	Mon Jun 18 17:02:27 2007
@@ -1,10 +1,6 @@
 # $Revision$, $Date$
-# TODO:
-# - revise arch_confdir patch to use /etc/pango and /etc/pango64 dirs
-#
 # Conditional build:
 %bcond_without	apidocs		# disable gtk-doc
-%bcond_without	arch_confdir	# build with arch-dependant config dir
 %bcond_without	static_libs	# don't build static library
 #
 Summary:	System for layout and rendering of internationalized text
@@ -12,7 +8,7 @@
 Summary(pt_BR.UTF-8):	Sistema para layout e renderização de texto internacionalizado
 Name:		pango
 Version:	1.16.4
-Release:	1
+Release:	2
 Epoch:		1
 License:	LGPL
 Group:		X11/Libraries
@@ -21,6 +17,7 @@
 Patch0:		%{name}-xfonts.patch
 Patch1:		%{name}-arch_confdir.patch
 URL:		http://www.pango.org/
+BuildRequires:	XFree86-devel
 BuildRequires:	autoconf >= 2.59-9
 BuildRequires:	automake >= 1:1.9
 BuildRequires:	cairo-devel >= 1.4.0
@@ -35,14 +32,19 @@
 BuildRequires:	perl-base
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.197
-BuildRequires:	xorg-lib-libX11-devel
-BuildRequires:	xorg-lib-libXft-devel >= 2.1.0
+BuildRequires:	xft-devel >= 2.1.0
 Requires:	cairo >= 1.4.0
 Requires:	freetype >= 2.1.7
 Requires:	glib2 >= 1:2.12.11
 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.
 
@@ -59,11 +61,11 @@
 Summary(pt_BR.UTF-8):	Sistema para layout e renderização de texto internacionalizado
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	XFree86-devel
 Requires:	cairo-devel >= 1.4.0
 Requires:	freetype-devel >= 2.1.7
 Requires:	glib2-devel >= 1:2.12.11
-Requires:	xorg-lib-libX11-devel
-Requires:	xorg-lib-libXft-devel >= 2.1.0
+Requires:	xft-devel >= 2.1.0
 Obsoletes:	libpango24-devel
 
 %description devel
@@ -132,7 +134,7 @@
 %prep
 %setup -q
 %patch0 -p1
-%{?with_arch_confdir:%patch1 -p1}
+%patch1 -p1
 
 %build
 %{?with_apidocs:%{__gtkdocize}}
@@ -157,7 +159,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.6.0/modules/*.{la,a}
@@ -168,19 +170,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
@@ -198,15 +200,9 @@
 %dir %{_libdir}/pango/1.6.0/modules
 %attr(755,root,root) %{_libdir}/pango/1.6.0/modules/pango-basic-fc.so
 %attr(755,root,root) %{_libdir}/pango/1.6.0/modules/pango-basic-x.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/pango-querymodules.1*
 
 %files devel
@@ -265,6 +261,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.174  2007/06/18 15:02:27  glen
+- revised archdir patch so /etc/pango or /etc/pango64 is used; rel 2
+
 Revision 1.173  2007/05/03 12:15:16  qrczak
 - 1.16.4
 
================================================================

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