Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e6152040ffd27c164b819242afa4f279ec8d08e0
commit e6152040ffd27c164b819242afa4f279ec8d08e0 Author: crazy <[EMAIL PROTECTED]> Date: Fri Nov 2 15:39:31 2007 +0100 hal-0.5.10-1-i686 * Version bump * as always removed / added patches * subpackage gone diff --git a/source/apps/hal/01-parted.patch b/source/apps/hal/01-parted.patch new file mode 100644 index 0000000..e6df31e --- /dev/null +++ b/source/apps/hal/01-parted.patch @@ -0,0 +1,34 @@ +diff -Naur hal-0.5.10/configure.in hal-0.5.10-p/configure.in +--- hal-0.5.10/configure.in 2007-09-25 17:47:27.000000000 +0200 ++++ hal-0.5.10-p/configure.in 2007-11-02 15:03:49.000000000 +0100 +@@ -244,7 +244,7 @@ + AC_DEFINE(USE_PARTED,1,[Whether libparted is to be used]) + AC_CHECK_LIB(uuid, uuid_generate, [], AC_MSG_ERROR([*** uuid library (libuuid) not found])) + AC_CHECK_LIB(dl, dlopen, [], AC_MSG_ERROR([*** dl library (libdl) not found])) +- AC_MSG_CHECKING([for libparted == 1.7.1, 1.8.0, 1.8.1, 1.8.2, 1.8.6, 1.8.7]) ++ AC_MSG_CHECKING([for libparted >= 1.7.1 or >= 1.8.0]) + LDFLAGS=-lparted + AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include <stdio.h> +@@ -258,18 +258,14 @@ + if ( sscanf( ped_get_version(), "%d.%d.%d", &major, &minor, µ ) == 3 ) + printf( "Found libparted %s", ped_get_version() ) ; + +- if ((major == 1 && minor == 7 && micro == 1) || +- (major == 1 && minor == 8 && micro == 0) || +- (major == 1 && minor == 8 && micro == 1) || +- (major == 1 && minor == 8 && micro == 2) || +- (major == 1 && minor == 8 && micro == 6) || +- (major == 1 && minor == 8 && micro == 7)) ++ if ((major == 1 && minor == 7 && micro >= 1) || ++ (major == 1 && minor == 8 && micro >= 0)) + return 0; + + return 1; + } + ]])], AC_MSG_RESULT([]), +- AC_MSG_ERROR([*** Requires libparted == 1.7.1/1.8.0/1.8.1/1.8.2/1.8.6 or 1.8.7])) ++ AC_MSG_ERROR([*** Requires libparted >= 1.7.1 or >= 1.8.0])) + PARTED_LIBS=-lparted + AC_SUBST(PARTED_LIBS) + LDFLAGS= diff --git a/source/apps/hal/FrugalBuild b/source/apps/hal/FrugalBuild index 636a247..40d10da 100644 --- a/source/apps/hal/FrugalBuild +++ b/source/apps/hal/FrugalBuild @@ -3,15 +3,15 @@ # Contributor: Christian Hamar alias krix <[EMAIL PROTECTED]> pkgname=hal -pkgver=0.5.9.1 -pkgrel=2 +pkgver=0.5.10 +pkgrel=1 pkgdesc="Hardware Abstraction Layer" url="http://www.freedesktop.org/wiki/Software/hal"; -depends=('dbus-glib>=0.71' 'udev>=100' 'glib2' 'libcap' 'dbus>=1.0.0' \ +depends=('dbus-glib>=0.74' 'udev>=100' 'glib2' 'libcap' 'dbus>=1.1.2' \ 'libusb' 'popt' 'pciutils' 'parted>=1.8.8' 'shadow>=4.0.18.1-2' \ 'dmidecode' 'usbutils' 'zlib') -makedepends=('pkgconfig' 'perl-xml' 'python>=2.5' 'intltool') -rodepends=('hal-info') +makedepends=('pkgconfig' 'perl-xml' 'intltool') +rodepends=('hal-info>=20071030') groups=('apps') replaces=('submount') options=('scriptlet') @@ -19,32 +19,23 @@ archs=('i686' 'x86_64') up2date="lynx -dump 'http://hal.freedesktop.org/releases/?C=M;O=A'|grep -v 'hal-info'|grep -v 'gnome'|grep -v PolicyKit|Flasttar" source=(http://hal.freedesktop.org/releases/$pkgname-$pkgver.tar.gz \ rc.hald \ + 01-parted.patch \ hal.conf.in.patch \ hal-device-manager.desktop \ ntfs-3g.patch \ - hal-allow_uid_for_ntfs.diff \ - hal-performance_pci.ids_v5.diff \ - hal-0.5.9-parted.diff) -sha1sums=('fc29322a0beba73c2eab3e0a44f9b820a5fbccdd' \ + hal-performance_pci.ids_v5.diff) +sha1sums=('8d67499df61590c11fd3203004d69e8a45abb8fa' \ 'ab629a3ea7df51df48abad30731590b8e86e908f' \ + '1d411b592b781336c5ff7ca2b4a2ad208af5acbe' \ 'be12d1327ca93e1830c5784f395e904b107f1947' \ '0c4968cbb842bdae350901728d81eed9895445fa' \ '2273e77c0c3c52aca31294b2b1a829937d0a3c18' \ - '32cd5a5043b2f817dc1d59fc98d7382fbca8a7fe' \ - '654235977c83f76433f9737f37b8a18f04136b35' \ - '3e0f5e494715f4b8fcc903b8c0eafdaa2745422e') + '654235977c83f76433f9737f37b8a18f04136b35') -subpkgs=("$pkgname-device-manager") -subdescs=('GNOME based device manager for HAL') -subdepends=('python>=2.5') -subrodepends=("dbus-python pygtk gnome-python $pkgname=$pkgver") -subgroups=('gnome-extra') -subarchs=('i686 x86_64') build() { - - Fmkdir usr/share/applications + Fcd Fpatchall Fautoreconf #autoreconf -v -i -f -d --warnings=all || return 1 @@ -61,21 +52,18 @@ build() --with-macbookpro=no \ --prefix=/usr \ --datadir=/usr/share \ + --libexecdir=/usr/lib/$pkgname \ --disable-acpi-acpid \ --enable-acpi-proc \ - --enable-acl-management \ --with-os-type=Frugalware \ --with-backend=linux \ --host=${CHOST} \ --build=${CHOST} + # TODO: package pm-tools and libsmbios .. ### BLAHHHHHHHHHHHHH Fmakeinstall - Fexe /usr/share/applications/$pkgname-device-manager.desktop - Fsplit $pkgname-device-manager usr/share/hal/device-manager - Fsplit $pkgname-device-manager usr/share/applications - Fsplit $pkgname-device-manager usr/bin/hal-device-manager - Frm /etc/hotplug.d - Fmkdir /media + Frm /etc/hotplug.d + Fmkdir /media Frcd hald } diff --git a/source/apps/hal/hal-0.5.9-parted.diff b/source/apps/hal/hal-0.5.9-parted.diff deleted file mode 100644 index 28d4cae..0000000 --- a/source/apps/hal/hal-0.5.9-parted.diff +++ /dev/null @@ -1,29 +0,0 @@ -diff -Naur hal-0.5.9.orig/configure.in hal-0.5.9/configure.in ---- hal-0.5.9.orig/configure.in 2007-04-03 06:36:44.000000000 +0200 -+++ hal-0.5.9/configure.in 2007-05-14 23:48:12.000000000 +0200 -@@ -193,7 +193,7 @@ - AC_DEFINE(USE_PARTED,1,[Whether libparted is to be used]) - AC_CHECK_LIB(uuid, uuid_generate, [], AC_MSG_ERROR([*** uuid library (libuuid) not found])) - AC_CHECK_LIB(dl, dlopen, [], AC_MSG_ERROR([*** dl library (libdl) not found])) -- AC_MSG_CHECKING([for libparted == 1.7.1, 1.8.0, 1.8.1, 1.8.2, 1.8.6]) -+ AC_MSG_CHECKING([for libparted == 1.7.1, 1.8.0, 1.8.1, 1.8.2, 1.8.6, 1.8.7, 1.8.8]) - LDFLAGS=-lparted - AC_TRY_RUN( - #include <stdio.h> -@@ -211,12 +211,14 @@ - (major == 1 && minor == 8 && micro == 0) || - (major == 1 && minor == 8 && micro == 1) || - (major == 1 && minor == 8 && micro == 2) || -- (major == 1 && minor == 8 && micro == 6)) -+ (major == 1 && minor == 8 && micro == 6) || -+ (major == 1 && minor == 8 && micro == 7) || -+ (major == 1 && minor == 8 && micro == 8)) - return 0; - - return 1; - } -- ,AC_MSG_RESULT( ),AC_MSG_ERROR([*** Requires libparted == 1.7.1/1.8.0/1.8.1/1.8.2 or 1.8.6]) ) -+ ,AC_MSG_RESULT( ),AC_MSG_ERROR([*** Requires libparted == 1.7.1/1.8.0/1.8.1/1.8.2/1.8.6/1.8.7 or 1.8.8]) ) - PARTED_LIBS=-lparted - AC_SUBST(PARTED_LIBS) - LDFLAGS= diff --git a/source/apps/hal/hal-allow_uid_for_ntfs.diff b/source/apps/hal/hal-allow_uid_for_ntfs.diff deleted file mode 100644 index 5d3d8ca..0000000 --- a/source/apps/hal/hal-allow_uid_for_ntfs.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/tools/hal-storage-mount.c b/tools/hal-storage-mount.c -index ef8d1a9..47412a8 100644 ---- a/tools/hal-storage-mount.c -+++ b/tools/hal-storage-mount.c -@@ -728,6 +728,7 @@ #endif - */ - if (strcmp (libhal_volume_get_fstype (volume), "vfat") != 0 && - strcmp (libhal_volume_get_fstype (volume), "iso9660") != 0 && -+ strcmp (libhal_volume_get_fstype (volume), "ntfs") != 0 && - strcmp (libhal_volume_get_fstype (volume), "udf") != 0) { - pol_change_uid = wants_to_change_uid; - } diff --git a/source/apps/hal/hal.install b/source/apps/hal/hal.install index 9ecda1f..2023d8d 100644 --- a/source/apps/hal/hal.install +++ b/source/apps/hal/hal.install @@ -2,13 +2,13 @@ post_install() { if ! grep -q '^hald:' /etc/group; then - groupadd -g 39 hald + /usr/sbin/groupadd -g 39 hald fi if ! grep -q '^hald:' /etc/passwd; then - useradd -c 'HAL Daemon' -u 39 -g hald -G cdrom,floppy,camera,storage -d '/' -s /bin/false hald + /usr/sbin/useradd -c 'HAL Daemon' -u 39 -g hald -G cdrom,floppy,camera,storage -d '/' -s /bin/false hald ## kill password - passwd -l hald 2>/dev/null >/dev/null + /usr/bin/passwd -l hald 2>/dev/null >/dev/null fi if [ -x /usr/sbin/chkconfig ]; then _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
