diff -u dbus.recipe.orig dbus.recipe --- dbus.recipe.orig 2005-09-09 21:08:20.000000000 +0400 +++ dbus.recipe 2005-10-25 17:32:27.000000000 +0400 @@ -3,46 +3,56 @@ # All rights reserved # -loadSuperClass('python.recipe') class Dbus(AutoPackageRecipe): buildRequires = [ 'expat:devel', 'glib:devel', 'Pyrex:runtime', 'pkgconfig:devel', 'gettext:runtime', 'atk:devel', 'gtk:devel', 'pango:devel', 'xorg-x11:devel', - ] + 'cairo:devel', 'fontconfig:devel', 'freetype:devel', + 'libpng:devel', 'libstdc++:devel', 'qt:devel', 'zlib:devel', + 'xmlto:runtime', 'doxygen:runtime', 'qt:runtime' ] name = 'dbus' - version = '0.34' + version = '0.50' def unpack(r): + r.macros.dbus_user = 'dbus' - r.macros.python_version = Python.majversion r.addArchive('http://www.freedesktop.org/software/dbus/releases/%(name)s-%(version)s.tar.gz') r.addSource('dbus.sh') r.Replace('.*', '%(dbus_user)s', 'bus/system.conf*') r.Replace('# chkconfig: 345 97 03', '# chkconfig: 345 08 03', 'bus/messagebus.in') + # Fix for pythondir on 64-bit arch + r.Replace('lib/python', '%(libdir)s/python', 'configure') def configure(r): - r.Configure('--enable-glib=yes --enable-qt=no --disable-tests' + + r.Configure('--enable-glib=yes --enable-qt=yes --disable-tests' ' --with-init-scripts=redhat --disable-mono --disable-mono-docs' ' --disable-verbose-mode --disable-asserts' ' --with-system-pid-file=%(localstatedir)s/run/messagebus.pid') - + def policy(r): - # doesn't seem to be a configure option for pythondir? - r.Move('/usr/lib/python*/site-packages/dbus/*', - '%(libdir)s/python%(python_version)s/site-packages/dbus/') - r.Remove('/usr/lib/python*', recursive=True) r.MakeDirs('%(localstatedir)s/run/dbus') r.MakeDirs('%(datadir)s/dbus-1/services') r.Install('dbus.sh', '/etc/X11/xinit/xinitrc.d/dbus.sh') r.ExcludeDirectories(exceptions=['%(datadir)s/dbus-1/services']) + r.ExcludeDirectories(exceptions=['%(sysconfdir)s/dbus-1/system.d']) r.ExcludeDirectories(exceptions=['%(localstatedir)s/run/dbus']) - r.PackageSpec('dbus-x11', '%(bindir)s/dbus-launch') - r.TagSpec('initscript', '%(initdir)s/') + r.TagSpec('initscript', '%(initdir)s/') r.UtilizeUser('dbus', '%(sysconfdir)s/.*/system.conf') + + r.PackageSpec('dbus-x11', '%(bindir)s/dbus-launch') + r.PackageSpec('dbus-qt', '%(libdir)s/libdbus-qt-.*') + r.PackageSpec('dbus-glib', + '%(libdir)s/libdbus-glib-.*', + '%(libdir)s/pkgconfig/dbus-glib-.*', + '%(bindir)s/dbus-monitor', + '%(bindir)s/dbus-viewer', + '%(bindir)s/dbus-binding-tool') +