[weasel-commit] Source: GConf=2.26.2-2
- From: rbuilder@xxxxxxxxx
- To: weasel-commit@xxxxxxxxxxxxx
- Date: Wed, 27 Jan 2010 19:34:28 -0500
================================
GConf:source=2.26.2-2 (previous: 2.26.2-1)
cvc rdiff GConf -1 /weasel.rpath.org@wgl:3-devel/2.26.2-2
================================
2.26.2-2 Filip Brcic (brcha@xxxxxxx) Wed Jan 27 19:34:17 2010
fixed recipe + metadata
GConf.recipe: changed
Index: GConf.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- GConf.recipe /weasel.rpath.org@wgl:3-devel/2.26.2-1
+++ GConf.recipe /weasel.rpath.org@wgl:3-devel/2.26.2-2
@@ -1,26 +1,35 @@
#
-# Copyright (c) 2004-2007 rPath, Inc.
-# This file is distributed under the terms of the MIT License.
-# A copy is available at http://www.rpath.com/permanent/mit-license.html
+# Copyright (c) 2010 Filip Brcic <brcha@xxxxxxxxxxxx>
+# Distributed under the terms of the GNU General Public License v3
#
loadSuperClass('gnomepackage')
-class GConf(GnomePackageRecipe):
+class Gconf(GnomePackageRecipe):
name = 'GConf'
version = '2.26.2'
- buildRequires = [ 'libxml2:devel', 'ORBit2:devel', 'glib:devel',
- 'gtk:devel', 'gettext:runtime', 'popt:devel',
- 'atk:devel', 'pango:devel', 'openldap:devel', 'perl:runtime',
- 'cairo:devel', 'fontconfig:devel', 'freetype:devel', 'libpng:devel',
- 'indent:runtime', 'file:runtime', 'PolicyKit:devel',
'PolicyKit:runtime',
- ]
+ buildRequires = [
+ 'ORBit2:devel', 'PolicyKit:devel', 'PolicyKit:runtime',
+ 'build-docbook-catalog:runtime', 'libxml2:devel',
+ 'openldap:devel',
+ ]
- buildMultiarch = True
+ shortDesc = 'GConf program'
+ longDesc = 'Gnome Configuration System and Daemon'
+ url = 'http://www.gnome.org/'
+ licenses = [ 'LGPL-2' ]
+ categories = [ 'Gnome' ]
- def setup(r):
- r.disableParallelMake()
- GnomePackageRecipe.setup(r)
+ patches = [
+ 'gconf-2.24.0-no-gconfd.patch',
+ ]
+
+ extraConfig = (
+ ' --enable-gtk'
+ ' --disable-static'
+ ' --with-openldap'
+ ' --enable-defaults-service'
+ )
def policy(r):
r.addSource('gconf2schema.tagdescription', macros=True,
@@ -31,9 +40,3 @@
r.Requires('/dev/null', '%(taghandlerdir)s/gconf2schema')
r.Requires('GConf:runtime', r'%(libdir)s/libgconf.*\.so\..*')
r.ExcludeDirectories(exceptions='%(sysconfdir)s/gconf/gconf.xml.*')
-
- # this just makes the testgconf program
- r.Make('check', dir='tests')
- r.TestSuiteFiles('testgconf')
- r.TestSuite('tests', './testgconf')
-
gconf-2.24.0-no-gconfd.patch: new
--- /dev/null
+++ gconf-2.24.0-no-gconfd.patch
@@ -0,0 +19 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN
GConf-2.23.2.old/gconf/gconftool.c GConf-2.23.2/gconf/gconftool.c
+--- GConf-2.23.2.old/gconf/gconftool.c 2008-06-28 05:27:33.000000000 -0400
++++ GConf-2.23.2/gconf/gconftool.c 2008-09-23 10:20:00.000000000 -0400
+@@ -856,6 +856,7 @@ main (int argc, char** argv)
+ {
+ g_print (_("GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, not
installing schemas\n"));
+ makefile_install_mode = FALSE;
++ return 0;
+ }
+
+ if (makefile_uninstall_mode &&
+@@ -863,6 +864,7 @@ main (int argc, char** argv)
+ {
+ g_print (_("GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL is set, not
uninstalling schemas\n"));
+ makefile_uninstall_mode = FALSE;
++ return 0;
+ }
+
+ if (makefile_install_mode || makefile_uninstall_mode)
Committed by: brcha
Other related posts:
