Updated patches and build script

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@20455 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/redhat/02_fix_class_mapping.patch b/gosa-core/redhat/02_fix_class_mapping.patch
index 95b8ea858d14b5679cee4a2c3b76196a397976a2..6b072daab2d51be060fbdbc9b2e63106205ec1f1 100644 (file)
--- a/gosa-core/redhat/02_fix_class_mapping.patch
+++ b/gosa-core/redhat/02_fix_class_mapping.patch
@@ -1,7 +1,26 @@
---- gosa-core~/include/functions.inc   2009-02-16 14:19:18.000000000 +0100
-+++ gosa-core/include/functions.inc    2009-02-16 14:18:15.000000000 +0100
+diff -urNad test/include/class_config.inc gosa-core/include/class_config.inc
+--- test/include/class_config.inc      2010-12-01 09:13:42.832749000 +0100
++++ gosa-core/include/class_config.inc 2010-12-01 10:16:52.347748997 +0100
+@@ -116,12 +116,12 @@
+            if we have installed or removed plugins. 
+          */
+         if(session::global_is_set("class_location.inc:timestamp")){
+-            $tmp = stat("../include/class_location.inc");
++          $tmp = $tmp = stat("/var/cache/gosa/class.cache");
+             if($tmp['mtime'] != session::global_get("class_location.inc:timestamp")){
+                 session::global_un_set("plist");
+             }
+         }
+-        $tmp = stat("../include/class_location.inc");
++        $tmp = stat("/var/cache/gosa/class.cache");
+         session::global_set("class_location.inc:timestamp",$tmp['mtime']);
+ 
+         if($this->filename != "" && filemtime($this->filename) != $this->last_modified){
+diff -urNad test/include/functions.inc gosa-core/include/functions.inc
+--- test/include/functions.inc 2010-12-01 10:08:16.784749004 +0100
++++ gosa-core/include/functions.inc    2010-12-01 10:10:49.198749000 +0100
 @@ -73,7 +73,7 @@
- $svn_revision = '$Revision: 13395 $';
+ define('DES3_CBC_SHA1',16);
  
  /* Include required files */
 -require_once("class_location.inc");
@@ -9,8 +28,9 @@
  require_once ("functions_debug.inc");
  require_once ("accept-to-gettext.inc");
  
---- gosa-core~/update-gosa     2009-02-16 14:19:18.000000000 +0100
-+++ gosa-core/update-gosa      2009-02-16 14:18:15.000000000 +0100
+diff -urNad test/update-gosa gosa-core/update-gosa
+--- test/update-gosa   2010-12-01 10:08:16.766749002 +0100
++++ gosa-core/update-gosa      2010-12-01 10:11:20.108749003 +0100
 @@ -21,7 +21,7 @@
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
@@ -20,7 +40,7 @@
  define ("LOCALE_DIR", GOSA_HOME."/locale");
  define ("PLUGSTATE_DIR", GOSA_HOME."/state");
  
-@@ -122,8 +122,8 @@
+@@ -136,8 +136,8 @@
  function rescan_classes()
  {
        echo "Updating class cache...\n";
@@ -31,20 +51,3 @@
  
        /* Sanity checks */
        if (!file_exists($filename) || is_writable($filename)) {
---- gosa-core~/include/class_config.inc        2009-02-16 14:19:18.000000000 +0100
-+++ gosa-core/include/class_config.inc 2009-02-16 14:18:15.000000000 +0100
-@@ -76,12 +76,12 @@
-         if we have installed or removed plugins. 
-      */
-     if(session::global_is_set("class_location.inc:timestamp")){
--      $tmp = stat("../include/class_location.inc");
-+      $tmp = $tmp = stat("/var/cache/gosa/class.cache");
-       if($tmp['mtime'] != session::global_get("class_location.inc:timestamp")){
-         session::global_un_set("plist");
-       }
-     }
--    $tmp = stat("../include/class_location.inc");
-+    $tmp = stat("/var/cache/gosa/class.cache");
-     session::global_set("class_location.inc:timestamp",$tmp['mtime']);
- 
-     if($this->filename != "" && filemtime($this->filename) != $this->last_modified){

diff --git a/gosa-core/redhat/make-gosa-package b/gosa-core/redhat/make-gosa-package
index 6a84e0a9ca4f6f6b2169873876acbb421144c7c1..bf2e1b3697fc31029fe7a8228486f3affc9bd932 100755 (executable)
--- a/gosa-core/redhat/make-gosa-package
+++ b/gosa-core/redhat/make-gosa-package
@@ -49,7 +49,7 @@ VERSION=$(cat rpm_src/gosa-core/debian/changelog | head -n 1 | sed -n -e 's/.*(\
 case "$distribution" in 
  "RHEL" ) 
        rm -rf /var/tmp/gosa*
-       build_path='/usr/src/redhat'
+       build_path='/root/rpmbuild/'
        target='redhat'
        ;;
  "SLES" ) 
@@ -106,7 +106,7 @@ sed "s/^Version:.*$/Version:            $VERSION/" \
 # Build GOsa RPM 
 ##
 echo "Try to build package ... rpmbuild" 
-rpmbuild -bb $build_path/SPECS/gosa.spec
+rpmbuild -bb --buildroot $build_path $build_path/SPECS/gosa.spec
 if [ $? != 0 ]
 then
        echo "Error: Build error"