- added miscstruct patch, build using new -Xserver-devel

[packages/XFree86-XIE.git] / XFree86-XIE.spec

diff --git a/XFree86-XIE.spec b/XFree86-XIE.spec
index 35be93bf928f0d5c8f435e6cbc19e137c1d5f570..039b3db75d1b534a1e1b2b4dffc3d9b91b2624a3 100644 (file)
--- a/XFree86-XIE.spec
+++ b/XFree86-XIE.spec
@@ -14,8 +14,9 @@ Group:                X11/Libraries
 # xc/doc/hardcopy/XIE
 Source0:       %{name}-%{version}.tar.bz2
 # Source0-md5: 6ae53620997b77ebc7b0b6cac8d1a4a0
+Patch0:                %{name}-miscstruct.patch
 URL:           http://www.xfree86.org/
-BuildRequires: XFree86-Xserver-devel >= 4.3.0
+BuildRequires: XFree86-Xserver-devel > 4.3.99.902-0.1
 BuildRequires: XFree86-devel >= 4.3.0
 Requires:      XFree86-libs >= 4.3.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -69,7 +70,7 @@ Dokumentacja do rozszerzenia XIE.
 Summary:       XIE extension module
 Summary(pl):   Modu³ rozszerzenia XIE
 Group:         X11/XFree86
-Requires:      XFree86-modules >= 4.3.0
+%{requires_eq_to XFree86-modules XFree86-Xserver}
 
 %description -n XFree86-module-XIE
 XIE (X Image Extension) extension module for X server.
@@ -79,6 +80,7 @@ Modu
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 cd xc
@@ -108,10 +110,12 @@ xmkmf
 %{__make} Makefiles
 %{__make} includes
 %{__make} depend \
-       EXTRA_INCLUDES="-I${XDIR}/include/extensions -I${XDIR}/include -I/usr/X11R6/include/X11/Xserver -I/usr/X11R6/include/X11"
+       TOP=/usr/X11R6/include/X11/Xserver \
+       EXTRA_INCLUDES="-I${XDIR}/include/extensions -I${XDIR}/include -I/usr/X11R6/include/X11"
 
 %{__make} \
-       CDEBUGFLAGS="%{rpmcflags} -I${XDIR}/include/extensions -I${XDIR}/include -I/usr/X11R6/include/X11/Xserver -I/usr/X11R6/include/X11"
+       TOP=/usr/X11R6/include/X11/Xserver \
+       CDEBUGFLAGS="%{rpmcflags} -I${XDIR}/include/extensions -I${XDIR}/include -I/usr/X11R6/include/X11"
 
 %install
 rm -rf $RPM_BUILD_ROOT