Source Mage code commit list

[Flavien Bridault <scm AT mail.sourcemage.org>]

GIT changes to master grimoire by Flavien Bridault <vlaaad AT sourcemage.org>:

 utils/hal/DEPENDS               |    7 -------
 utils/hal/HISTORY               |    4 ++++
 utils/hal/libparted_check.patch |   25 ++++++++++++++++++++-----
 3 files changed, 24 insertions(+), 12 deletions(-)

New commits:
commit dfd511dfd2276f4947ba3085091bc6673db610e2
Author: Flavien Bridault <vlaaad AT sourcemage.org>
Commit: Flavien Bridault <vlaaad AT sourcemage.org>

    hal: fix compiling with latest parted spell, removed expat dependency

diff --git a/utils/hal/DEPENDS b/utils/hal/DEPENDS
index 21bc06f..8cf1924 100755
--- a/utils/hal/DEPENDS
+++ b/utils/hal/DEPENDS
@@ -8,13 +8,6 @@ depends  python             &&
 depends  udev               &&
 depends  xml-parser-expat   &&
 depends  pkgconfig          &&
-#
-# expat should have --with-expat or --without-expat but there is an bug in 
configure.
-#
-optional_depends  expat               \
-                  "--with-expat"                  \
-                  "--without-expat"                  \
-                  "Enable expat use"  &&
 
 #optional_depends  polkit                    \
 #                  "--enable-policy-kit"     \
diff --git a/utils/hal/HISTORY b/utils/hal/HISTORY
index dee7119..6de7555 100644
--- a/utils/hal/HISTORY
+++ b/utils/hal/HISTORY
@@ -1,3 +1,7 @@
+2006-11-28 Flavien Bridault <vlaaad AT sourcemage.org>
+       * DEPENDS: removed expat, implied by xml-parser-expat
+       * libparted_check.patch: modified to work with all upper versions of 
libparted
+
 2006-10-23 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * DEPENDS: added optional pciutils; made dmidecode optional
        * PRE_BUILD: fix configure for macbookpro (remove in next release)
diff --git a/utils/hal/libparted_check.patch b/utils/hal/libparted_check.patch
index e974e10..b75c1e5 100644
--- a/utils/hal/libparted_check.patch
+++ b/utils/hal/libparted_check.patch
@@ -1,15 +1,30 @@
 --- configure.old      2006-09-19 22:24:41.000000000 +0200
-+++ configure  2006-10-04 22:45:20.000000000 +0200
-@@ -21658,7 +21658,7 @@
++++ configure  2006-12-02 10:34:32.000000000 +0100
+@@ -21658,9 +21658,9 @@
  echo "$as_me: error: *** dl library (libdl) not found" >&2;}
     { (exit 1); exit 1; }; }
  fi
 -
+-   echo "$as_me:$LINENO: checking for libparted == 1.7.1" >&5
+-echo $ECHO_N "checking for libparted == 1.7.1... $ECHO_C" >&6
 +save_LDFLAGS="$LDFLAGS"
-    echo "$as_me:$LINENO: checking for libparted == 1.7.1" >&5
- echo $ECHO_N "checking for libparted == 1.7.1... $ECHO_C" >&6
++   echo "$as_me:$LINENO: checking for libparted >= 1.7.1" >&5
++echo $ECHO_N "checking for libparted >= 1.7.1... $ECHO_C" >&6
     LDFLAGS=-lparted
-@@ -21717,7 +21717,7 @@
+    if test "$cross_compiling" = yes; then
+   { { echo "$as_me:$LINENO: error: cannot run test program while cross 
compiling
+@@ -21686,7 +21686,9 @@
+       if ( sscanf( ped_get_version(), "%d.%d.%d", &major, &minor, &micro ) 
== 3 )
+               printf( "Found libparted %s", ped_get_version() ) ;
+ 
+-        return ! ( major == 1 && minor == 7 && micro == 1 ) ;
++        return ! ((major > 1) ||
++                 ((major == 1) && (minor > 7)) ||
++                 ((major == 1) && (minor == 7) && (micro >= 1))) ;
+     }
+ 
+ _ACEOF
+@@ -21717,7 +21719,7 @@
  fi
      PARTED_LIBS=-lparted