================================ libgpg-error:source=1.7-2 (previous: 1.7-1) cvc rdiff libgpg-error -1 /weasel.rpath.org@wgl:3-devel/1.7-2 ================================ 1.7-2 Filip Brcic (brcha@xxxxxxx) Wed Jan 6 10:49:51 2010 fixed recipe libgpg-error.recipe: changed Index: libgpg-error.recipe ==================================================================== contents(size sha1) inode(mtime) --- libgpg-error.recipe /weasel.rpath.org@wgl:3-devel/1.7-1 +++ libgpg-error.recipe /weasel.rpath.org@wgl:3-devel/1.7-2 @@ -1,42 +1,26 @@ # -# Copyright (c) 2004-2006 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@xxxxxxx> +# Distributed under the terms of the GNU General Public License v3 # -class LibGPGError(AutoPackageRecipe): +class LibgpgError(AutoPackageRecipe): name = 'libgpg-error' version = '1.7' - buildRequires = [ 'gettext:runtime', 'intltool:runtime' ] + buildRequires = [ + 'gettext:runtime', 'intltool:runtime', + ] - if Arch.x86_64: - buildRequires.extend(['multiarch_wrapper:runtime']) + shortDesc = 'Error handling functions of GnuPG' + longDesc = 'Contains error handling functions used by GnuPG software' + url = 'http://www.gnupg.org/related_software/libgpg-error' + licenses = [ 'GPL-2', 'LGPL-2.1' ] + categories = [ 'System/Development', 'Development/Libraries' ] def unpack(r): - r.addArchive('ftp://ftp.gnupg.org/gcrypt/libgpg-error/', keyid='1CE0C630') - - if Arch.x86_64: - # First build 32bit library - macros32 = r.macros.copy() - macros32.cc = '"gcc -m32"' - macros32.cxx = '"g++ -m32"' - macros32.libdir = '%(prefix)s/lib' - r.Configure(objDir='build32', overrideMacros=macros32, - preConfigure='CXXCPP=%(bindir)s/cpp') - r.Make(dir='build32', overrideMacros=macros32) - r.MakeInstall(dir='build32', overrideMacros=macros32) - r.Move('%(bindir)s/gpg-error-config', '%(bindir)s/gpg-error-config-32') - r.ComponentSpec('devel', '%(bindir)s/gpg-error-config-32') + r.addArchive('mirror://gnupg/%(name)s/') def configure(r): - # FIXME: hack to get around missing /lib/cpp link in bootstrap - # gcc - specify where to find the g++ cpp - r.Configure(preConfigure='CXXCPP=%(bindir)s/cpp') - - def policy(r): - if Arch.x86_64: - r.Move('%(bindir)s/gpg-error-config', '%(bindir)s/gpg-error-config-64') - r.ComponentSpec('devel', '%(bindir)s/gpg-error-config-64') - r.Symlink('%(bindir)s/multiarch_wrapper', '%(bindir)s/gpg-error-config') - r.DanglingSymlinks(exceptions='%(bindir)s/gpg-error-config') + r.Configure( + ' --enable-nls' + ) Committed by: brcha