diff -u hal.recipe.orig hal.recipe --- hal.recipe.orig 2005-10-06 22:23:49.000000000 +0400 +++ hal.recipe 2005-10-25 21:33:26.000000000 +0400 @@ -4,16 +4,18 @@ # class Hal(AutoPackageRecipe): - buildRequires = [ 'expat:devel', 'glib:devel', 'dbus:devel', + + buildRequires = [ 'expat:devel', 'glib:devel', 'dbus-glib:devellib', 'dbus:devel', 'python:devel', 'hwdata:runtime', 'doxygen:runtime', - 'gettext:devel', 'libusb:devel', 'popt:devel', - 'linux-kernel-headers:devel', 'intltool:runtime', - 'pkgconfig:devel'] - - extraConfig = '--with-os-type=redhat --with-init-scripts=redhat '\ - '--with-stab-file=%(localstatedir)s/lib/pcmcia/stab '\ - '--enable-pcmcia-support --enable-sysfs-carrier '\ - '--enable-hotplug-map --disable-fstab-sync' + 'libusb:devel', 'popt:devel', 'linux-kernel-headers:devel', + 'pkgconfig:devel', 'gettext:runtime', 'perl:runtime' ] + + extraConfig = ( '--with-os-type=redhat --with-init-scripts=redhat ' + '--with-stab-file=%(localstatedir)s/lib/pcmcia/stab ' + '--enable-pcmcia-support --enable-sysfs-carrier ' + '--enable-hotplug-map --disable-fstab-sync ' + '--enable-acpi-acpid --disable-acpi-proc' + '--disable-selinux' ) if Use.builddocs: buildRequires.extend(['docbook-utils:runtime', 'openjade:runtime']) @@ -24,17 +26,35 @@ version = '0.5.4' def unpack(r): + r.addArchive('http://freedesktop.org/~david/dist/%(name)s-%(version)s.tar.gz') + r.Replace('# chkconfig: 345 98 02', '# chkconfig: 345 98 09', 'hald/haldaemon.in') + r.Replace(('enable_fstab_sync=yes', 'enable_fstab_sync=$enableval'), + ('acpi_acpid=no', 'acpi_acpid=$enableval'), + ('acpi_proc=no', 'acpi_proc=$enableval'), + 'configure') + + r.MakeDirs('%(sysconfdir)s/hal/fdi/information', + '%(sysconfdir)s/hal/fdi/policy', + '%(sysconfdir)s/hal/fdi/preprobe') + + def configure(r): + r.Configure(r.extraConfig) def policy(r): - r.Remove('%(libexecdir)s/hald-addon-acpi') - r.PackageSpec('hal-gnome', '%(datadir)s/%(name)s/device-manager/', - '%(bindir)s/hal-device-manager') r.TagSpec('initscript', '%(initdir)s/') + r.UtilizeUser('haldaemon', r'%(sysconfdir)s/.*/hal\.conf') + + r.ExcludeDirectories(exceptions=['%(datadir)s/hal/']) + r.ExcludeDirectories(exceptions=['%(sysconfdir)s/hal/']) + + r.PackageSpec('hal-gnome', '%(datadir)s/%(name)s/device-manager/', + '%(bindir)s/hal-device-manager') +