[arch-commits] Commit in gnome-panel/trunk (PKGBUILD)

[Jan de Groot]

    Date: Wednesday, September 15, 2010 @ 06:19:15
  Author: jgc
Revision: 90686

Split bonobo module into its own package

Modified:
  gnome-panel/trunk/PKGBUILD

----------+
 PKGBUILD |   37 +++++++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-09-15 09:34:13 UTC (rev 90685)
+++ PKGBUILD	2010-09-15 10:19:15 UTC (rev 90686)
@@ -1,31 +1,48 @@
 # $Id$
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
-pkgname=gnome-panel
-pkgver=2.30.2
+pkgbase=gnome-panel
+pkgname=('gnome-panel' 'gnome-panel-bonobo')
+pkgver=2.31.92
 pkgrel=1
-pkgdesc="The GNOME Panel"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.gnome.org"
-depends=('libwnck>=2.30.2' 'gnome-menus>=2.30.2' 'evolution-data-server>=2.30.2' 'gnome-desktop>=2.30.2' 'libgweather>=2.30.2' 'librsvg>=2.26.0' 'hicolor-icon-theme' 'libcanberra' 'libbonoboui>=2.24.2')
-makedepends=('gnome-doc-utils>=0.20.0' 'pkg-config' 'intltool' 'networkmanager')
+makedepends=('libwnck' 'gnome-menus' 'evolution-data-server' 'gnome-desktop' 'libgweather' 'librsvg' 'hicolor-icon-theme' 'libcanberra' 'libbonoboui' 'gnome-doc-utils' 'pkg-config' 'intltool' 'networkmanager')
 options=('!libtool' '!emptydirs')
-groups=('gnome')
 install=gnome-panel.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('f0171c55ecdf4970f819cce66de0db99bbe43832e8a284ea0dd0c89d7d12e7b6')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.31/${pkgbase}-${pkgver}.tar.bz2)
+sha256sums=('e8b75954e0437f7cefd6cef070ed646bc595a617c39db0b99e3939ddda5bcca3')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgbase}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --libexecdir=/usr/lib/gnome-panel \
-      --disable-scrollkeeper
+      --disable-scrollkeeper --disable-introspection
   make
+  sed -e 's/$(am__append_1)//' -i Makefile
+}
+
+package_gnome-panel() {
+  pkgdesc="The GNOME Panel"
+  depends=('gnome-menus' 'gnome-desktop' 'evolution-data-server' 'librsvg' 'libcanberra' 'libwnck' 'hicolor-icon-theme')
+  optdepends=('gnome-panel-bonobo: libbonoboui-based applet support')
+  groups=('gnome')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
   gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-panel-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas
   rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
 }
+
+package_gnome-panel-bonobo() {
+  pkgdesc="Modules for libbonoboui-based applet support for the GNOME Panel"
+  depends=('libbonoboui' 'gnome-panel')
+  conflicts=('gnome-panel<2.31.92')
+
+  cd "${srcdir}/${pkgbase}-${pkgver}"
+  make -C bonobo "${pkgdir}" DESTDIR="${pkgdir}" install
+}