SPECS: Mesa.spec - up to 6.3.2 - remove outdated opt patch - use m...

[jpc]

Author: jpc                          Date: Thu Oct 20 18:04:42 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 6.3.2
- remove outdated opt patch
- use modular deps
- use sed instead of perl in prep

---- Files affected:
SPECS:
   Mesa.spec (1.83 -> 1.84) 

---- Diffs:

================================================================
Index: SPECS/Mesa.spec
diff -u SPECS/Mesa.spec:1.83 SPECS/Mesa.spec:1.84
--- SPECS/Mesa.spec:1.83	Thu Dec 16 12:03:32 2004
+++ SPECS/Mesa.spec	Thu Oct 20 20:04:37 2005
@@ -2,36 +2,30 @@
 #
 # Conditional build:
 %bcond_with	glide	# with GLIDE (broken now)
-%bcond_with	xlibs	# use xlibs deps
 #
 Summary:	Free OpenGL implementation
 Summary(pl):	Wolnodostępna implementacja standardu OpenGL
 Name:		Mesa
-Version:	6.2.1
+Version:	6.3.2
 Release:	1
 License:	MIT (core), LGPL (MesaGLU), SGI (GLU,libGLw) and others - see COPYRIGHT file
 Group:		X11/Libraries
 Source0:	http://dl.sourceforge.net/mesa3d/%{name}Lib-%{version}.tar.bz2
-# Source0-md5:	f43228cd2bf70f583ef3275c1c545421
+# Source0-md5:	0df27701df0924d17ddf41185efa8ce1
 Source1:	http://dl.sourceforge.net/mesa3d/%{name}Demos-%{version}.tar.bz2
-# Source1-md5:	3cac74667b50bcbd4f67f594fb4224a2
-Patch0:		%{name}-opt.patch
+# Source1-md5:	96708868450c188205e42229b5d813c4
 URL:		http://www.mesa3d.org/
 %ifarch %{ix86} alpha
 %{?with_glide:BuildRequires:	Glide3-DRI-devel}
 %{?with_glide:Requires:	Glide3-DRI}
 %endif
-%if %{with xlibs}
-BuildRequires:	libXmu-devel
-BuildRequires:	libXp-devel
-%else
-BuildRequires:	XFree86-devel
-%endif
+BuildRequires:	xorg-lib-libXmu-devel
+BuildRequires:	xorg-lib-libXp-devel
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	libtool >= 2:1.4d
 BuildRequires:	motif-devel
-BuildRequires:	%{__perl}
+BuildRequires:	sed >= 4.0
 Provides:	OpenGL = 1.5
 Provides:	OpenGL-GLU = 1.3
 # reports version 1.3, but supports glXGetProcAddress() from 1.4
@@ -113,10 +107,9 @@
 
 %prep
 %setup -q -n Mesa-%{version} -b 1
-%patch0 -p1
 
 # fix demos
-%{__perl} -pi -e "s,\.\./images/,%{_examplesdir}/Mesa/images/,g" progs/demos/*
+find progs -type f|xargs sed -i -e "s,\.\./images/,%{_examplesdir}/Mesa/images/,g"
 
 %build
 %ifarch %{ix86}
@@ -128,7 +121,7 @@
 %{__make} ${targ}-static \
 	CC="%{__cc}" \
 	CXX="%{__cxx}" \
-	OPT="%{rpmcflags}" \
+	OPT_FLAGS="%{rpmcflags}" \
 	XLIB_DIR=/usr/X11R6/%{_lib} \
 	GLW_SOURCES="GLwDrawA.c GLwMDrawA.c"
 mv -f lib lib-static
@@ -136,7 +129,7 @@
 %{__make} ${targ} \
 	CC="%{__cc}" \
 	CXX="%{__cxx}" \
-	OPT="%{rpmcflags}" \
+	OPT_FLAGS="%{rpmcflags}" \
 	XLIB_DIR=/usr/X11R6/%{_lib}
 
 %install
@@ -210,6 +203,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.84  2005/10/20 18:04:37  jpc
+- up to 6.3.2
+- remove outdated opt patch
+- use modular deps
+- use sed instead of perl in prep
+
 Revision 1.83  2004/12/16 11:03:32  adamg
 - updated to 6.2.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/Mesa.spec?r1=1.83&r2=1.84&f=u