packages: OpenCASCADE/OpenCASCADE.spec, OpenCASCADE/OpenCASCADE6.3.0-casroo...

gotar gotar at pld-linux.org
Sat Jun 5 23:16:59 CEST 2010 

Author: gotar                        Date: Sat Jun  5 21:16:59 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- avoid versioning and weird dirs, just KISS

---- Files affected:
packages/OpenCASCADE:
   OpenCASCADE.spec (1.8 -> 1.9) , OpenCASCADE6.3.0-casroot.patch (1.1 -> 1.2) , OpenCASCADE.conf (1.1 -> NONE)  (REMOVED), OpenCASCADE6.3.0-lib-release.patch (1.1 -> NONE)  (REMOVED), OpenCASCADE6.3.0-make-draw-libs-private.patch (1.1 -> NONE)  (REMOVED), OpenCASCADE6.3.0-make-wok-libs-private.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/OpenCASCADE/OpenCASCADE.spec
diff -u packages/OpenCASCADE/OpenCASCADE.spec:1.8 packages/OpenCASCADE/OpenCASCADE.spec:1.9
--- packages/OpenCASCADE/OpenCASCADE.spec:1.8	Sat Jun  5 23:13:01 2010
+++ packages/OpenCASCADE/OpenCASCADE.spec	Sat Jun  5 23:16:53 2010
@@ -18,12 +18,10 @@
 Group:		Applications/Engineering
 Source0:	http://files.opencascade.com/OCC_6.3_release/%{name}_src.tgz
 # Source0-md5:	52778127974cb3141c2827f9d40d1f11
-Source1:	 %name.conf
 Patch0:		%{name}6.3.0-obs-check.patch
 Patch1:		%{name}6.3.0-strcmp.patch
 Patch2:          OpenCASCADE6.3.0-occ6.3.0.patch
 Patch3:          OpenCASCADE6.3.0-casroot.patch
-Patch4:          OpenCASCADE6.3.0-lib-release.patch
 Patch5:          OpenCASCADE6.3.0-tkernel-ld.patch
 Patch6:          OpenCASCADE6.3.0-mft-disable-mmap.patch
 Patch7:          OpenCASCADE6.3.0-no-bitmaps-icon.patch
@@ -31,8 +29,6 @@
 Patch9:          OpenCASCADE6.3.0-maint-mode.patch
 Patch10:         OpenCASCADE6.3.0-dep-libs.patch
 Patch11:         OpenCASCADE6.3.0-move-vrml-vis.patch
-Patch12:         OpenCASCADE6.3.0-make-wok-libs-private.patch
-Patch13:         OpenCASCADE6.3.0-make-draw-libs-private.patch
 Patch14:         OpenCASCADE6.3.0-wok-install.patch
 Patch15:         OpenCASCADE6.3.0-udlist.patch
 Patch16:         OpenCASCADE6.3.0-WOKUnix_FDescr.patch
@@ -92,7 +88,6 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
@@ -100,8 +95,6 @@
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
-%patch13 -p1
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
@@ -212,6 +205,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2010/06/05 21:16:53  gotar
+- avoid versioning and weird dirs, just KISS
+
 Revision 1.8  2010/06/05 21:13:01  gotar
 - initial FHS compliance [-37m]
 

================================================================
Index: packages/OpenCASCADE/OpenCASCADE6.3.0-casroot.patch
diff -u packages/OpenCASCADE/OpenCASCADE6.3.0-casroot.patch:1.1 packages/OpenCASCADE/OpenCASCADE6.3.0-casroot.patch:1.2
--- packages/OpenCASCADE/OpenCASCADE6.3.0-casroot.patch:1.1	Fri May 28 12:26:25 2010
+++ packages/OpenCASCADE/OpenCASCADE6.3.0-casroot.patch	Sat Jun  5 23:16:53 2010
@@ -13,7 +13,7 @@
 -      cout << " CASROOT or CSF_MDTVFontDirectory  are mandatory to use this fonctionnality " << endl;
 -      Standard_Failure::Raise ( "CSF_MDTVTexturesDirectory and CASROOT not setted " );
 +    if ( !casroot ) {
-+      casroot = "/usr/share/opencascade/6.3.0";
++      casroot = "/usr/share/OpenCASCADE";
      }
 +    TCollection_AsciiString CasRootString (casroot);
 +    CasRootString += "/src/FontMFT" ; 
@@ -33,7 +33,7 @@
 -      PluginName+="/src/StdResource" ;
 -      hasPlugin = Standard_True ;
 +    if ( !casroot ) {
-+      casroot = "/usr/share/opencascade/6.3.0";
++      casroot = "/usr/share/OpenCASCADE";
      }
 +    PluginName = TCollection_AsciiString (casroot);
 +    PluginName+="/src/StdResource" ;
@@ -50,7 +50,7 @@
  #else
 -	cout << " the CASROOT variable is mandatory to Run OpenCascade "<<endl;
 -	cout << "No default file" << endl;
-+	ReadInitFile("/usr/share/opencascade/6.3.0/src/DrawResources/DrawDefault");
++	ReadInitFile("/usr/share/OpenCASCADE/src/DrawResources/DrawDefault");
  #endif
        } else {
       
@@ -68,7 +68,7 @@
 -      aResult = aDirFound = Standard_False;
 -      cout << FAILSTR "Neither " << aCSFVariable.ToCString() << ", nor CASROOT variables have been set" << endl;
 +    if ( aPluginDir.IsEmpty() ) {
-+      aPluginDir = "/usr/share/opencascade/6.3.0";
++      aPluginDir = "/usr/share/OpenCASCADE";
      }
 +    aPluginDir +="/src/DrawResources" ;
 +    aToSetCSFVariable = Standard_True; //CSF variable to be set later
@@ -87,7 +87,7 @@
 -    } else {
 -  puts " CASROOT is Mandatory to Run OpenCascade"
 +    if { ![info exists env(CASROOT) ] } {
-+      set env(CASROOT) "/usr/share/opencascade/6.3.0"
++      set env(CASROOT) "/usr/share/OpenCASCADE"
      }
 +  set dir [file join $env(CASROOT) src DrawResources]
  }
@@ -123,7 +123,7 @@
 -    aShr = NULL;
 -    printf("You have not defined CSF_GraphicShr or CASROOT, aborting...");
 -    return Standard_False;
-+    glshr = "/usr/lib/libTKOpenGl-6.3.0.so";
++    glshr = "/usr/lib/libTKOpenGl.so";
    }
   
   aShr = glshr;
@@ -139,7 +139,7 @@
 -	VarName += "/src/Textures" ;
 -	HasDefinition = Standard_True ;
 +      if ( !casroot ) {
-+	casroot = "/usr/share/opencascade/6.3.0";
++	casroot = "/usr/share/OpenCASCADE";
        }
 +      VarName = TCollection_AsciiString  (casroot);
 +      VarName += "/src/Textures" ;
@@ -159,7 +159,7 @@
 -	VarName += "/src/Textures" ;
 -	HasDefinition = Standard_True ;
 +      if ( !casroot ) {
-+	casroot = "/usr/share/opencascade/6.3.0";
++	casroot = "/usr/share/OpenCASCADE";
        }
 +      VarName = TCollection_AsciiString  (casroot);
 +      VarName += "/src/Textures" ;
@@ -179,7 +179,7 @@
 -	VarName += "/src/Textures" ;
 -	HasDefinition = Standard_True ;
 +      if ( !casroot ) {
-+	casroot = "/usr/share/opencascade/6.3.0";
++	casroot = "/usr/share/OpenCASCADE";
        }
 +      VarName = TCollection_AsciiString  (casroot);
 +      VarName += "/src/Textures" ;
@@ -201,7 +201,7 @@
 -      else {
 -	Standard_NoSuchObject::Raise("environment variable CSF_UnitsLexicon undefined");
 +      if (CasRootString.Length() == 0 )  {
-+        CasRootString = "/usr/share/opencascade/6.3.0";
++        CasRootString = "/usr/share/OpenCASCADE";
        }
 +      CasRootString += "/src/UnitsAPI/Lexi_Expr.dat" ;
 +      Units::LexiconFile(CasRootString.ToCString());
@@ -219,7 +219,7 @@
 -      else {
 -	Standard_NoSuchObject::Raise("environment variable CSF_UnitsDefinition undefined");
 +      if (CasRootString.Length() == 0 ) {
-+        CasRootString = "/usr/share/opencascade/6.3.0";
++        CasRootString = "/usr/share/OpenCASCADE";
        }
 +      CasRootString += "/src/UnitsAPI/Units.dat";
 +      Units::UnitsFile(CasRootString.ToCString());
@@ -238,7 +238,7 @@
 -	VarName += "/src/Textures" ;
 -	HasDefinition = Standard_True ;
 +      if ( !casroot ) {
-+	casroot = "/usr/share/opencascade/6.3.0";
++	casroot = "/usr/share/OpenCASCADE";
        }
 +      VarName = TCollection_AsciiString  (casroot);
 +      VarName += "/src/Textures" ;
@@ -257,7 +257,7 @@
 -      aResourceDir += "/src/XmlOcafResource" ;
 -      aToSetCSFVariable = Standard_True; //CSF variable to be set later
 +    if ( aResourceDir.IsEmpty() ) {
-+      aResourceDir = "/usr/share/opencascade/6.3.0";
++      aResourceDir = "/usr/share/OpenCASCADE";
      }
 -#ifdef DEB
 -    else {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/OpenCASCADE/OpenCASCADE.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/OpenCASCADE/OpenCASCADE6.3.0-casroot.patch?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list