abstract demo files to a build option, add default case platform error, correct image paths

mesa/mesa.patch

@@ -19,110 +19,3 @@ diff -Nau configs/default.orig configs/default
 +GLUT_LIB_DEPS = -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm
  GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXt -lX11
  APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
-Index: progs/demos/Makefile
-diff -Nau progs/demos/Makefile.orig progs/demos/Makefile
---- progs/demos/Makefile.orig	2004-10-23 19:00:52.000000000 +0200
-+++ progs/demos/Makefile	2005-03-23 21:52:13.356915218 +0100
-@@ -5,9 +5,9 @@
- 
- INCDIR = $(TOP)/include
- 
--OSMESA_LIBS = -L$(LIB_DIR) -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS)
-+OSMESA_LIBS = -L$(LIB_DIR) -lglut -lOSMesa -lGLU -lGL $(GLUT_LIB_DEPS)
- 
--OSMESA32_LIBS = -L$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(APP_LIB_DEPS)
-+OSMESA32_LIBS = -L$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(GLUT_LIB_DEPS)
- 
- LIB_DEP = $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(GLU_LIB_NAME) $(LIB_DIR)/$(GLUT_LIB_NAME)
- 
-@@ -67,7 +67,7 @@
- 
- # make executable from .c file:
- .c: $(LIB_DEP)
--	$(CC) -I$(INCDIR) $(CFLAGS) $< $(APP_LIB_DEPS) -o $@
-+	$(CC) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
- 
- 
- ##### TARGETS #####
-Index: progs/demos/arbfplight.c
-diff -Nau progs/demos/arbfplight.c.orig progs/demos/arbfplight.c
---- progs/demos/arbfplight.c.orig	2005-03-23 18:50:08 +0100
-+++ progs/demos/arbfplight.c	2005-03-23 18:50:12 +0100
-@@ -6,6 +6,7 @@
-  * 17 April 2003
-  */
- 
-+#include <GL/gl.h>
- #include <assert.h>
- #include <string.h>
- #include <stdio.h>
-Index: progs/redbook/Makefile
-diff -Nau progs/redbook/Makefile.orig progs/redbook/Makefile
---- progs/redbook/Makefile.orig	2005-03-23 20:36:22 +0100
-+++ progs/redbook/Makefile	2005-03-23 20:36:29 +0100
-@@ -24,7 +24,7 @@
- .SUFFIXES: .c
- 
- .c: $(LIB_DEP)
--	$(CC) -I$(INCDIR) $(CFLAGS) $< $(APP_LIB_DEPS) -o $@
-+	$(CXX) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
- 
- 
- 
-Index: progs/samples/Makefile
-diff -Nau progs/samples/Makefile.orig progs/samples/Makefile
---- progs/samples/Makefile.orig	2004-08-25 16:51:18 +0200
-+++ progs/samples/Makefile	2005-03-23 21:21:16 +0100
-@@ -18,7 +18,7 @@
- .SUFFIXES: .c
- 
- .c: $(LIB_DEP)
--	$(CC) -I$(INCDIR) $(CFLAGS) $< $(APP_LIB_DEPS) -o $@
-+	$(CC) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
- 
- 
- 
-@@ -26,6 +26,8 @@
- 
- default: $(PROGS)
- 
-+nurb: nurb.c
-+	$(CXX) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
- 
- clean:
- 	-rm -f $(PROGS)
-Index: progs/xdemos/Makefile
-diff -Nau progs/xdemos/Makefile.orig progs/xdemos/Makefile
---- progs/xdemos/Makefile.orig	2005-03-23 21:04:26 +0100
-+++ progs/xdemos/Makefile	2005-03-23 21:04:46 +0100
-@@ -33,7 +33,7 @@
- .SUFFIXES: .c
- 
- .c: $(LIB_DEP)
--	$(CC) -I$(INCDIR) $(CFLAGS) $< $(APP_LIB_DEPS) -o $@
-+	$(CC) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
- 
- 
- ##### TARGETS #####
-@@ -48,10 +48,10 @@
- 
- # special cases
- pbinfo: pbinfo.o pbutil.o
--	$(CC) pbinfo.o pbutil.o $(APP_LIB_DEPS) -o $@
-+	$(CC) pbinfo.o pbutil.o -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
- 
- pbdemo: pbdemo.o pbutil.o
--	$(CC) pbdemo.o pbutil.o $(APP_LIB_DEPS) -o $@
-+	$(CC) pbinfo.o pbutil.o -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
- 
- pbinfo.o: pbinfo.c pbutil.h
- 	$(CC) -c -I. -I$(INCDIR) $(CFLAGS) pbinfo.c
-@@ -64,7 +64,7 @@
- 
- 
- xrotfontdemo: xrotfontdemo.o xuserotfont.o
--	$(CC) xrotfontdemo.o xuserotfont.o $(APP_LIB_DEPS) -o $@
-+	$(CC) xrotfontdemo.o xuserotfont.o -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
- 
- xuserotfont.o: xuserotfont.c xuserotfont.h
- 	$(CC) -c -I. -I$(INCDIR) $(CFLAGS) xuserotfont.c

mesa/mesa.patch.demos

@@ -0,0 +1,107 @@
+Index: progs/demos/Makefile
+diff -Nau progs/demos/Makefile.orig progs/demos/Makefile
+--- progs/demos/Makefile.orig	2004-10-23 19:00:52.000000000 +0200
++++ progs/demos/Makefile	2005-03-23 21:52:13.356915218 +0100
+@@ -5,9 +5,9 @@
+ 
+ INCDIR = $(TOP)/include
+ 
+-OSMESA_LIBS = -L$(LIB_DIR) -lglut -lOSMesa -lGLU -lGL $(APP_LIB_DEPS)
++OSMESA_LIBS = -L$(LIB_DIR) -lglut -lOSMesa -lGLU -lGL $(GLUT_LIB_DEPS)
+ 
+-OSMESA32_LIBS = -L$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(APP_LIB_DEPS)
++OSMESA32_LIBS = -L$(LIB_DIR) -lglut -lOSMesa32 -lGLU -lGL $(GLUT_LIB_DEPS)
+ 
+ LIB_DEP = $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(GLU_LIB_NAME) $(LIB_DIR)/$(GLUT_LIB_NAME)
+ 
+@@ -67,7 +67,7 @@
+ 
+ # make executable from .c file:
+ .c: $(LIB_DEP)
+-	$(CC) -I$(INCDIR) $(CFLAGS) $< $(APP_LIB_DEPS) -o $@
++	$(CC) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
+ 
+ 
+ ##### TARGETS #####
+Index: progs/demos/arbfplight.c
+diff -Nau progs/demos/arbfplight.c.orig progs/demos/arbfplight.c
+--- progs/demos/arbfplight.c.orig	2005-03-23 18:50:08 +0100
++++ progs/demos/arbfplight.c	2005-03-23 18:50:12 +0100
+@@ -6,6 +6,7 @@
+  * 17 April 2003
+  */
+ 
++#include <GL/gl.h>
+ #include <assert.h>
+ #include <string.h>
+ #include <stdio.h>
+Index: progs/redbook/Makefile
+diff -Nau progs/redbook/Makefile.orig progs/redbook/Makefile
+--- progs/redbook/Makefile.orig	2005-03-23 20:36:22 +0100
++++ progs/redbook/Makefile	2005-03-23 20:36:29 +0100
+@@ -24,7 +24,7 @@
+ .SUFFIXES: .c
+ 
+ .c: $(LIB_DEP)
+-	$(CC) -I$(INCDIR) $(CFLAGS) $< $(APP_LIB_DEPS) -o $@
++	$(CXX) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
+ 
+ 
+ 
+Index: progs/samples/Makefile
+diff -Nau progs/samples/Makefile.orig progs/samples/Makefile
+--- progs/samples/Makefile.orig	2004-08-25 16:51:18 +0200
++++ progs/samples/Makefile	2005-03-23 21:21:16 +0100
+@@ -18,7 +18,7 @@
+ .SUFFIXES: .c
+ 
+ .c: $(LIB_DEP)
+-	$(CC) -I$(INCDIR) $(CFLAGS) $< $(APP_LIB_DEPS) -o $@
++	$(CC) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
+ 
+ 
+ 
+@@ -26,6 +26,8 @@
+ 
+ default: $(PROGS)
+ 
++nurb: nurb.c
++	$(CXX) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
+ 
+ clean:
+ 	-rm -f $(PROGS)
+Index: progs/xdemos/Makefile
+diff -Nau progs/xdemos/Makefile.orig progs/xdemos/Makefile
+--- progs/xdemos/Makefile.orig	2005-03-23 21:04:26 +0100
++++ progs/xdemos/Makefile	2005-03-23 21:04:46 +0100
+@@ -33,7 +33,7 @@
+ .SUFFIXES: .c
+ 
+ .c: $(LIB_DEP)
+-	$(CC) -I$(INCDIR) $(CFLAGS) $< $(APP_LIB_DEPS) -o $@
++	$(CC) -I$(INCDIR) $(CFLAGS) $< -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
+ 
+ 
+ ##### TARGETS #####
+@@ -48,10 +48,10 @@
+ 
+ # special cases
+ pbinfo: pbinfo.o pbutil.o
+-	$(CC) pbinfo.o pbutil.o $(APP_LIB_DEPS) -o $@
++	$(CC) pbinfo.o pbutil.o -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
+ 
+ pbdemo: pbdemo.o pbutil.o
+-	$(CC) pbdemo.o pbutil.o $(APP_LIB_DEPS) -o $@
++	$(CC) pbinfo.o pbutil.o -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
+ 
+ pbinfo.o: pbinfo.c pbutil.h
+ 	$(CC) -c -I. -I$(INCDIR) $(CFLAGS) pbinfo.c
+@@ -64,7 +64,7 @@
+ 
+ 
+ xrotfontdemo: xrotfontdemo.o xuserotfont.o
+-	$(CC) xrotfontdemo.o xuserotfont.o $(APP_LIB_DEPS) -o $@
++	$(CC) xrotfontdemo.o xuserotfont.o -L$(LIB_DIR) -L$(X11LIB_DIR) -l$(GLUT_LIB) $(GLUT_LIB_DEPS) -o $@
+ 
+ xuserotfont.o: xuserotfont.c xuserotfont.h
+ 	$(CC) -c -I. -I$(INCDIR) $(CFLAGS) xuserotfont.c

mesa/mesa.spec

@@ -33,12 +33,16 @@ Class:        EVAL
 Group:        XWindow
 License:      LGPL
 Version:      6.2.1
-Release:      20050323
+Release:      20050324
+
+#   package options
+%option       with_demos  no
 
 #   list of sources
 Source0:      http://osdn.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-%{version}.tar.bz2
 Source1:      http://osdn.dl.sourceforge.net/sourceforge/mesa3d/MesaDemos-%{version}.tar.bz2
 Patch0:       mesa.patch
+Patch1:       mesa.patch.demos
 
 #   build information
 Prefix:       %{l_prefix}
@@ -68,11 +72,16 @@ AutoReqProv:  no
 
 %prep
     %setup -q -n Mesa-%{version}
-    %setup -q -n Mesa-%{version} -T -D -b 1
     %patch -p0
+%if "%{with_demos}" == "yes"
+    %setup -q -n Mesa-%{version} -T -D -b 1
+    %patch -p0 -P 1
+    %{l_shtool} subst \
+        -e 's;"\.\./images;"%{l_prefix}/lib/mesa/images;g' \
+        `find . -type f -exec grep "\"\.\.\/images" {} \; -print | grep "^\.\/"`
+%endif
 
 %build
-    plat=""
     case "%{l_platform -t}" in
         *-freebsd* )
             plat="freebsd"
@@ -86,6 +95,10 @@ AutoReqProv:  no
         sun*-sunos* )
             plat="sunos5-gcc"
             ;;
+        * )
+            echo "platform %{l_platform -t} not supported" 2>&1;
+            exit 1;
+            ;;
     esac
     CC="%{l_cc}" \
     CXX="%{l_cxx}" \
@@ -99,18 +112,25 @@ AutoReqProv:  no
 %install
     rm -rf $RPM_BUILD_ROOT
     %{l_shtool} mkdir -f -p -m 755 \
-        $RPM_BUILD_ROOT%{l_prefix}/lib/mesa \
+        $RPM_BUILD_ROOT%{l_prefix}/lib \
         $RPM_BUILD_ROOT%{l_prefix}/include/GL
+    %{l_shtool} install -c -m 644 \
+        lib/* $RPM_BUILD_ROOT%{l_prefix}/lib/
+    %{l_shtool} install -c -m 644 \
+        include/GL/*.h $RPM_BUILD_ROOT%{l_prefix}/include/GL/
+%if "%{with_demos}" == "yes"
+    %{l_shtool} mkdir -f -p -m 755 \
+        $RPM_BUILD_ROOT%{l_prefix}/lib/mesa/demos \
+        $RPM_BUILD_ROOT%{l_prefix}/lib/mesa/images
     %{l_shtool} install -s -c -m 755 \
         `find progs/demos/ -type f -prune -perm 755 -print` \
         `find progs/redbook/ -type f -prune -perm 755 -print` \
         `find progs/samples/ -type f -prune -perm 755 -print` \
         `find progs/xdemos/ -type f -prune -perm 755 -print` \
-        $RPM_BUILD_ROOT%{l_prefix}/lib/mesa/
+        $RPM_BUILD_ROOT%{l_prefix}/lib/mesa/demos/
     %{l_shtool} install -c -m 644 \
-        lib/* $RPM_BUILD_ROOT%{l_prefix}/lib/
-    %{l_shtool} install -c -m 644 \
-        include/GL/*.h $RPM_BUILD_ROOT%{l_prefix}/include/GL/
+        progs/images/* $RPM_BUILD_ROOT%{l_prefix}/lib/mesa/images/
+%endif
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
 
 %files -f files