SPECS: xorg-lib-libX11.spec - %{_libdir}/X11 needs to be dir not symlink fr...

[glen]

Author: glen                         Date: Fri Feb 27 00:06:16 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- %{_libdir}/X11 needs to be dir not symlink from ac upgrade; rel 2

---- Files affected:
SPECS:
   xorg-lib-libX11.spec (1.44 -> 1.45) 

---- Diffs:

================================================================
Index: SPECS/xorg-lib-libX11.spec
diff -u SPECS/xorg-lib-libX11.spec:1.44 SPECS/xorg-lib-libX11.spec:1.45
--- SPECS/xorg-lib-libX11.spec:1.44	Tue Feb 17 17:43:58 2009
+++ SPECS/xorg-lib-libX11.spec	Fri Feb 27 01:06:11 2009
@@ -8,7 +8,7 @@
 Summary(pl.UTF-8):	Podstawowa biblioteka X11
 Name:		xorg-lib-libX11
 Version:	1.2
-Release:	1
+Release:	2
 License:	MIT
 Group:		X11/Libraries
 Source0:	http://xorg.freedesktop.org/releases/individual/lib/libX11-%{version}.tar.bz2
@@ -21,6 +21,9 @@
 BuildRequires:	libtool
 %{?with_xcb:BuildRequires:	libxcb-devel >= 1.2}
 BuildRequires:	pkgconfig >= 1:0.19
+BuildRequires:	xorg-lib-libXau-devel
+BuildRequires:	xorg-lib-libXdmcp-devel
+BuildRequires:	xorg-lib-xtrans-devel
 BuildRequires:	xorg-proto-bigreqsproto-devel
 BuildRequires:	xorg-proto-inputproto-devel
 BuildRequires:	xorg-proto-kbproto-devel
@@ -28,9 +31,6 @@
 BuildRequires:	xorg-proto-xextproto-devel
 BuildRequires:	xorg-proto-xf86bigfontproto-devel
 BuildRequires:	xorg-proto-xproto-devel >= 7.0.6
-BuildRequires:	xorg-lib-libXdmcp-devel
-BuildRequires:	xorg-lib-libXau-devel
-BuildRequires:	xorg-lib-xtrans-devel
 BuildRequires:	xorg-util-util-macros >= 1.1.0
 %{?with_xcb:Requires:	libxcb >= 1.2}
 Obsoletes:	libX11
@@ -105,13 +105,21 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	pkgconfigdir=%{_pkgconfigdir}
-	
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
+%pretrans
+# this needs to be a dir
+if [ -f -L %{_libdir}/X11 ]; then
+	umask 022
+	mv -f %{_libdir}/X11{,.rpmsave}
+	mkdir %{_libdir}/X11
+fi
+
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING ChangeLog README
@@ -157,6 +165,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.45  2009/02/27 00:06:11  glen
+- %{_libdir}/X11 needs to be dir not symlink from ac upgrade; rel 2
+
 Revision 1.44  2009/02/17 16:43:58  arekm
 - up to 1.2
 
@@ -216,7 +227,7 @@
 
 Revision 1.26  2006/11/24 11:07:22  arekm
 - up to 1.1; enable xcb
-[fixes CVE-2006-5397]
+  [fixes CVE-2006-5397]
 
 Revision 1.25  2006/11/21 00:24:40  arekm
 - rebuild
@@ -325,7 +336,7 @@
 - removed redudant R/BR.
 
 Revision 1.7  2004/03/06 22:52:10  adgor
-- Added COPYING to %%doc
+- Added COPYING to %doc
 
 Revision 1.6  2004/03/06 11:17:41  pluto
 - R:
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xorg-lib-libX11.spec?r1=1.44&r2=1.45&f=u