diff --git a/libxfixes.spec b/libxfixes.spec
index 4ddaa89..4a6205d 100644
--- a/libxfixes.spec
+++ b/libxfixes.spec
@@ -2,39 +2,39 @@
 %define libname		%mklibname xfixes %{major}
 %define develname	%mklibname xfixes -d
 
-Name: libxfixes
-Summary:  X Fixes  Library
-Version: 5.0
-Release: 2
-Group: Development/X11
-License: MIT
-URL: http://xorg.freedesktop.org
-Source0: http://xorg.freedesktop.org/releases/individual/lib/libXfixes-%{version}.tar.bz2
+Name:		libxfixes
+Summary:	X Fixes  Library
+Version:	5.0
+Release:	4
+Group:		Development/X11
+License:	MIT
+URL:		http://xorg.freedesktop.org
+Source0:	http://xorg.freedesktop.org/releases/individual/lib/libXfixes-%{version}.tar.bz2
 
-BuildRequires: libx11-devel >= 1.0.0
-BuildRequires: x11-proto-devel >= 7.6-3
-BuildRequires: x11-util-macros >= 1.0.1
+BuildRequires:	pkgconfig(x11)
+BuildRequires:	x11-proto-devel >= 7.6-3
+BuildRequires:	x11-util-macros >= 1.0.1
 
 %description
 %{name} is a simple library designed to interface the X Fixes Extension.
 
 %package -n %{libname}
-Summary:  X Fixes  Library
-Group: Development/X11
-Conflicts: libxorg-x11 < 7.0
-Provides: %{name} = %{version}
+Summary:	X Fixes  Library
+Group:		Development/X11
+Conflicts:	libxorg-x11 < 7.0
+Provides:	%{name} = %{version}
 
 %description -n %{libname}
 %{name} is a simple library designed to interface the X Fixes Extension.
 
 %package -n %{develname}
-Summary: Development files for %{name}
-Group: Development/X11
-Requires: %{libname} = %{EVRD}
-Provides: libxfixes-devel = %{EVRD}
-Obsoletes: %{_lib}xfixes3-devel
-Obsoletes: %{_lib}xfixes-static-devel
-Conflicts: libxorg-x11-devel < 7.0
+Summary:	Development files for %{name}
+Group:		Development/X11
+Requires:	%{libname} = %{version}-%{release}
+Provides:	libxfixes-devel = %{version}-%{release}
+Obsoletes:	%{_lib}xfixes3-devel < 5.0
+Obsoletes:	%{_lib}xfixes-static-devel < 5.0
+Conflicts:	libxorg-x11-devel < 7.0
 
 %description -n %{develname}
 Development files for %{name}
@@ -54,11 +54,6 @@ Development files for %{name}
 rm -rf %{buildroot}
 %makeinstall_std
 
-%pre -n %{develname}
-if [ -h %{_includedir}/X11 ]; then
-	rm -f %{_includedir}/X11
-fi
-
 %files -n %{libname}
 %{_libdir}/libXfixes.so.%{major}*
 
@@ -68,9 +63,11 @@ fi
 %{_includedir}/X11/extensions/Xfixes.h
 %{_mandir}/man3/Xfixes.*
 
-
-
 %changelog
+* Thu Mar 08 2012 Paulo Andrade <pcpa@mandriva.com.br> 5.0-3
++ Revision: 783360
+- Remove pre scriptlet to correct rpm upgrade moving from /usr/X11R6.
+
 * Tue Dec 27 2011 Matthew Dawkins <mattydaw@mandriva.org> 5.0-2
 + Revision: 745649
 - rebuild