From 1423206e6b5b499031d16c8432421a70ecb7f6c6 Mon Sep 17 00:00:00 2001 From: Don BURNS Date: Tue, 16 Apr 2002 05:29:39 +0000 Subject: [PATCH] Fixed some boo-boos in makerpms for building demo source files... --- Make/makerpms | 21 +++++++++++++----- dist/RPM/OpenSceneGraph.spec | 2 ++ dist/RPM/OpenSceneGraph_dev.spec | 38 +++++--------------------------- 3 files changed, 22 insertions(+), 39 deletions(-) diff --git a/Make/makerpms b/Make/makerpms index d50dd6a61..49fb1199e 100644 --- a/Make/makerpms +++ b/Make/makerpms @@ -109,7 +109,7 @@ make_osg() mkdir $RPM_BUILD_DIR s_install $TOPDIR/lib 755 $INST_LIBS - s_install $TOPDIR/lib/osgPlugins 744 $INST_PLUGINS + s_install $TOPDIR/lib/osgPlugins 755 $INST_PLUGINS s_install $TOPDIR/bin 755 $INST_DEMOS make_targz OpenSceneGraph-$REV @@ -133,15 +133,22 @@ make_osg_dev() for d in `ls $TOPDIR/include | grep -v CVS` do [ -d $TOPDIR/include/$d ] && \ - s_install $TOPDIR/include/$d 644 $INST_INCLUDE/$d + s_install $TOPDIR/include/$d 644 $INST_INCLUDE/$d done - for d in `ls $TOPDIR/src/Demos | grep -v CVS` + + for d in `ls -1 $INST_DEMO_SRC` do - [ -d $TOPDIR/src/Demos/$d ] && \ - s_install $TOPDIR/src/Demos/$d 644 $INST_DEMO_SRC/$d + if [ -d $INST_DEMO_SRC/$d ] + then + s_install $INST_DEMO_SRC/$d 644 $INST_DEMO_SRC/$d + fi + cd $THISDIR done + s_install $INST_SRC/Make 644 $INST_SRC/Make + + make_targz OpenSceneGraph_dev-$REV make_spec OpenSceneGraph_dev @@ -155,6 +162,8 @@ make_osg_dev() print_attr $INST_DEMO_SRC/$d 755 >> $TOPDIR/dist/RPM/OpenSceneGraph_dev.spec done + print_attr $INST_SRC/Make 755 >> $TOPDIR/dist/RPM/OpenSceneGraph_dev.spec + rpm -bb --clean $TOPDIR/dist/RPM/OpenSceneGraph_dev.spec mv /usr/src/redhat/RPMS/i386/OpenSceneGraph_dev-$REV-$REL.i386.rpm dist/RPM @@ -168,7 +177,7 @@ then exit 1 fi -if [ $# -ne 8 ] +if [ $# -ne 10 ] then echo echo makerpm : Internal Error - Bad Usage diff --git a/dist/RPM/OpenSceneGraph.spec b/dist/RPM/OpenSceneGraph.spec index b17852c24..4d7ea99b5 100644 --- a/dist/RPM/OpenSceneGraph.spec +++ b/dist/RPM/OpenSceneGraph.spec @@ -64,10 +64,12 @@ tar cvf - . | tar xvfC - / %attr(755, root, root) /usr/share/OpenSceneGraph/bin/osgcopy %attr(755, root, root) /usr/share/OpenSceneGraph/bin/osgcube %attr(755, root, root) /usr/share/OpenSceneGraph/bin/osghangglide +%attr(755, root, root) /usr/share/OpenSceneGraph/bin/osghud %attr(755, root, root) /usr/share/OpenSceneGraph/bin/osgimpostor %attr(755, root, root) /usr/share/OpenSceneGraph/bin/osgreflect %attr(755, root, root) /usr/share/OpenSceneGraph/bin/osgscribe %attr(755, root, root) /usr/share/OpenSceneGraph/bin/osgstereoimage +%attr(755, root, root) /usr/share/OpenSceneGraph/bin/osgtext %attr(755, root, root) /usr/share/OpenSceneGraph/bin/osgtexture %attr(755, root, root) /usr/share/OpenSceneGraph/bin/osgversion %attr(755, root, root) /usr/share/OpenSceneGraph/bin/osgviews diff --git a/dist/RPM/OpenSceneGraph_dev.spec b/dist/RPM/OpenSceneGraph_dev.spec index 9dab94bda..d921a4fc8 100644 --- a/dist/RPM/OpenSceneGraph_dev.spec +++ b/dist/RPM/OpenSceneGraph_dev.spec @@ -49,6 +49,7 @@ tar cvf - . | tar xvfC - / %attr(755, root, root) /usr/local/include/osg/Depth %attr(755, root, root) /usr/local/include/osg/DisplaySettings %attr(755, root, root) /usr/local/include/osg/Drawable +%attr(755, root, root) /usr/local/include/osg/DrawPixels %attr(755, root, root) /usr/local/include/osg/EarthSky %attr(755, root, root) /usr/local/include/osg/Export %attr(755, root, root) /usr/local/include/osg/Fog @@ -150,7 +151,6 @@ tar cvf - . | tar xvfC - / %attr(755, root, root) /usr/local/include/osgUtil/GUIEventHandler %attr(755, root, root) /usr/local/include/osgUtil/InsertImpostorsVisitor %attr(755, root, root) /usr/local/include/osgUtil/IntersectVisitor -%attr(755, root, root) /usr/local/include/osgUtil/NewCullVisitor %attr(755, root, root) /usr/local/include/osgUtil/Optimizer %attr(755, root, root) /usr/local/include/osgUtil/RenderBin %attr(755, root, root) /usr/local/include/osgUtil/RenderGraph @@ -174,75 +174,47 @@ tar cvf - . | tar xvfC - / %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/hangglide/hat.cpp %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/hangglide/hat.h %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/hangglide/Makefile -%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/hangglide/Makefile.new -%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/hangglide/Makefile.old %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/hangglide/ReaderWriterFLY.cpp -%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/hangglide/README %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/hangglide/sky.cpp %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/hangglide/tank.cpp %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/hangglide/terrain.cpp %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/hangglide/terrain_data.h %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/hangglide/trees.cpp %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgbillboard/Makefile -%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgbillboard/Makefile.new -%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgbillboard/Makefile.old %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgbillboard/osgbillboard.cpp %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgcluster/broadcaster.cpp %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgcluster/broadcaster.h %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgcluster/Makefile -%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgcluster/Makefile.new -%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgcluster/Makefile.old %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgcluster/osgcluster.cpp -%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgcluster/README %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgcluster/receiver.cpp %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgcluster/receiver.h %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgconv/Makefile -%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgconv/Makefile.new -%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgconv/Makefile.old %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgconv/OrientationConverter.cpp %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgconv/OrientationConverter.h %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgconv/osgconv.cpp %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgcopy/Makefile -%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgcopy/Makefile.new -%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgcopy/Makefile.old %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgcopy/osgcopy.cpp %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgcube/Makefile -%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgcube/Makefile.new -%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgcube/Makefile.old %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgcube/osgcube.cpp +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osghud/Makefile +%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osghud/osghud.cpp %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgimpostor/Makefile -%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgimpostor/Makefile.new -%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgimpostor/Makefile.old %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgimpostor/osgimpostor.cpp -%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgimpostor/README %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgreflect/Makefile -%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgreflect/Makefile.new -%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgreflect/Makefile.old %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgreflect/osgreflect.cpp %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgscribe/Makefile -%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgscribe/Makefile.new -%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgscribe/Makefile.old %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgscribe/osgscribe.cpp %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgstereoimage/Makefile -%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgstereoimage/Makefile.new -%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgstereoimage/Makefile.old %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgstereoimage/osgstereoimage.cpp %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgtext/main.cpp %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgtext/Makefile -%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgtext/Makefile.new -%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgtext/Makefile.old %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgtexture/Makefile -%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgtexture/Makefile.new -%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgtexture/Makefile.old %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgtexture/osgtexture.cpp %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgversion/Makefile %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgversion/osgversion.cpp %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgviews/Makefile -%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgviews/Makefile.new -%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgviews/Makefile.old %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/osgviews/osgviews.cpp %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/sgv/Makefile -%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/sgv/Makefile.new -%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/sgv/Makefile.old -%attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/sgv/README %attr(755, root, root) /usr/share/OpenSceneGraph/src/demos/sgv/sgv.cpp +%attr(755, root, root) /usr/share/OpenSceneGraph/src/Make/makedefs +%attr(755, root, root) /usr/share/OpenSceneGraph/src/Make/makerules