- make utils before moving libGLU; upadated todo

Changed files:
    Mesa.spec -> 1.94

diff --git a/Mesa.spec b/Mesa.spec
index e0d43da7162ee5ec1289eec00ff19c83d2be45ac..c26f7718f082774901ed6da4e0dfc7b9df993baa 100644 (file)
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -1,6 +1,6 @@
 #
 # TODO:
-# - separate libGL/libGLU/libGLw,progs?
+# - subpackage with non-dri libGL for use with X-servers with missing GLX extension?
 #
 # Conditional build:
 %bcond_with    glide   # with GLIDE (broken now)
@@ -288,17 +288,6 @@ mv -f lib lib-static
        XLIB_DIR=%{_libdir} \
        SRC_DIRS="glx/x11 mesa glu glw" \
        PROGRAM_DIRS=
-mv -f lib lib-dri
-%{__make} clean \
-       MKDEP=makedepend
-
-%{__make} linux${targ} \
-       CC="%{__cc}" \
-       CXX="%{__cxx}" \
-       OPT_FLAGS="%{rpmcflags} -fno-strict-aliasing" \
-       XLIB_DIR=%{_libdir} \
-       SRC_DIRS="mesa" \
-       PROGRAM_DIRS=
 
 %{__make} -C progs/xdemos \
        CC="%{__cc}" \
@@ -316,6 +305,18 @@ mv -f lib lib-dri
        PROGS="glxinfo" \
        APP_LIB_DEPS="-L\$(LIB_DIR) -lGLU -lGL"
 
+mv -f lib lib-dri
+%{__make} clean \
+       MKDEP=makedepend
+
+%{__make} linux${targ} \
+       CC="%{__cc}" \
+       CXX="%{__cxx}" \
+       OPT_FLAGS="%{rpmcflags} -fno-strict-aliasing" \
+       XLIB_DIR=%{_libdir} \
+       SRC_DIRS="mesa" \
+       PROGRAM_DIRS=
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_includedir}/GL,%{_examplesdir}/%{name}-%{version}}