X-Git-Url: http://git.pld-linux.org/?p=packages%2FXFree86-XIE.git;a=blobdiff_plain;f=XFree86-XIE.spec;h=44d0c8793e4c0d4e6aba0e682efa3b0bf36e5ac5;hp=5b21277ec28f8dd8a384f9bc64f6d9dfc2999c08;hb=491f2cb3d5840d29a59a330ad4375919fea9e592;hpb=759127f95a4438643dac7b41919d85f2c78cc8cc

diff --git a/XFree86-XIE.spec b/XFree86-XIE.spec
index 5b21277..44d0c87 100644
--- a/XFree86-XIE.spec
+++ b/XFree86-XIE.spec
@@ -13,8 +13,10 @@ Group:		X11/Libraries
 # xc/doc/specs/XIE
 # 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)
@@ -32,7 +34,7 @@ Biblioteka rozszerzenia XIE (X Image Extension).
 Summary:	XIE extension headers
 Summary(pl):	Pliki nag³ówkowe rozszerzenia XIE
 Group:		X11/Development/Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 Requires:	XFree86-devel >= 4.3.0
 
 %description devel
@@ -45,7 +47,7 @@ Pliki nag
 Summary:	XIE extension static library
 Summary(pl):	Statyczna biblioteka rozszerzenia XIE
 Group:		X11/Development/Libraries
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
 XIE extension static library.
@@ -56,7 +58,7 @@ Statyczna biblioteka rozszerzenia XIE.
 %package doc
 Summary:	XIE extension documentation
 Summary(pl):	Dokumentacja do rozszerzenia XIE
-Group:		X11/XFree86
+Group:		X11
 
 %description doc
 XIE extension documentation.
@@ -67,8 +69,8 @@ Dokumentacja do rozszerzenia XIE.
 %package -n XFree86-module-XIE
 Summary:	XIE extension module
 Summary(pl):	Modu³ rozszerzenia XIE
-Group:		X11/XFree86
-Requires:	XFree86-modules >= 4.3.0
+Group:		X11
+%{requires_eq_to XFree86-modules XFree86-Xserver-devel}
 
 %description -n XFree86-module-XIE
 XIE (X Image Extension) extension module for X server.
@@ -78,6 +80,7 @@ Modu
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 cd xc
@@ -107,15 +110,17 @@ 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
-
 install -d $RPM_BUILD_ROOT%{_includedir}/X11/extensions
+
 install xc/include/extensions/{XIE,XIEproto,XIEprotost}.h \
 	$RPM_BUILD_ROOT%{_includedir}/X11/extensions