[SM-Commit] PERFORCE change 80112 by Flavien Bridault for review

Perforce Review Daemon p4review at smee.org
Fri Jun 2 11:50:00 EDT 2006


Change 80112 by flavien_bridault at flavien-Gargamel on 2006/06/02 16:45:14

	integrate from devel

Affected files ...

... //sgl/grimoires/test/graphics-libs/openglut/DEPENDS#1 branch
... //sgl/grimoires/test/graphics-libs/openglut/DETAILS#7 integrate
... //sgl/grimoires/test/graphics-libs/openglut/HISTORY#8 integrate
... //sgl/grimoires/test/graphics-libs/openglut/PREPARE#2 integrate
... //sgl/grimoires/test/graphics-libs/openglut/PRE_BUILD#3 integrate
... //sgl/grimoires/test/graphics-libs/openglut/openglut-0.6.3-doc.tar.bz2.sig#1 branch
... //sgl/grimoires/test/graphics-libs/openglut/openglut-0.6.3.tar.bz2.sig#1 branch

Differences ...

==== //sgl/grimoires/test/graphics-libs/openglut/DETAILS#7 (xtext) ====

@@ -8,12 +8,15 @@
 else
          VERSION=0.6.3
           SOURCE=${SPELL}-${VERSION}.tar.bz2
+   SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+      SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+  if [ "$DOC" == "y" ]; then
          SOURCE2=${SPELL}-${VERSION}-doc.tar.bz2
-   SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
   SOURCE2_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE2
-     SOURCE_HASH=sha512:60031490d08514f975635379a030fb46f9334c0a2d2e941ec0248ba3cea0d99bee1f3fae67b872886cf00d67b48f4e603f31b727d2625da7eed250ded9243e77
-    SOURCE2_HASH=sha512:df99ea61bee2908fbc4536e3e99f4b20eac8d554a17232062b9f83554c0e53f2fe22548b3ec5e64eb6007bb3e817a40c6b5208471f73fd257ea293b8aee2bc08
+     SOURCE2_GPG="gurus.gpg:${SOURCE2}.sig:WORKS_FOR_ME"
+  fi
 fi
+
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
         WEB_SITE=http://openglut.sourceforge.net/
          ENTERED=20040322

==== //sgl/grimoires/test/graphics-libs/openglut/HISTORY#8 (text) ====

@@ -1,3 +1,8 @@
+2006-06-02 Flavien Bridault <vlaaad at sourcemage.org>
+	* PREPARE: Prompt for extra documentation
+	* PRE_BUILD, DETAILS: Made extra documentation package optional
+	* DEPENDS: Added missing depends, such as groff (bug #12591)
+
 2006-05-26 Flavien Bridault <vlaaad at sourcemage.org>
 	* DETAILS: Corrected sourceforge cvs url (bug #11880)
 

==== //sgl/grimoires/test/graphics-libs/openglut/PREPARE#2 (xtext) ====

@@ -1,1 +1,4 @@
-config_query  CVS  "Use CVS version?"  n
+config_query  CVS  "Use CVS version?"  n  &&
+if [ "$CVS" == "n" ]; then
+  config_query  DOC  "Install extra documentation package?"  n
+fi

==== //sgl/grimoires/test/graphics-libs/openglut/PRE_BUILD#3 (xtext) ====

@@ -1,6 +1,6 @@
 default_pre_build            &&
 
-if  [  "$CVS"  ==  "n"  ];  then
-  cd  $SOURCE_DIRECTORY        &&
+if  [  "$DOC"  ==  "y"  ]; then
+  cd  $SOURCE_DIRECTORY  &&
   unpack_file 2
 fi



More information about the SM-Commit mailing list