[weasel-commit] Source: pango=1.24.5-2
- From: rbuilder@xxxxxxxxx
- To: weasel-commit@xxxxxxxxxxxxx
- Date: Fri, 08 Jan 2010 14:31:40 -0500
================================
pango:source=1.24.5-2 (previous: 1.24.5-1)
cvc rdiff pango -1 /weasel.rpath.org@wgl:3-devel/1.24.5-2
================================
1.24.5-2 Filip Brcic (brcha@xxxxxxx) Fri Jan 8 14:31:26 2010
fixed recipe + added metadata
pango.recipe: changed
Index: pango.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- pango.recipe /weasel.rpath.org@wgl:3-devel/1.24.5-1
+++ pango.recipe /weasel.rpath.org@wgl:3-devel/1.24.5-2
@@ -1,5 +1,6 @@
#
# Copyright (c) 2004-2007 rPath, Inc.
+# Copyright (c) 2009-2010 Filip Brcic <brcha@xxxxxxx>
# This file is distributed under the terms of the MIT License.
# A copy is available at http://www.rpath.com/permanent/mit-license.html
#
@@ -10,24 +11,25 @@
version = '1.24.5'
GnomePackageRecipe.buildRequires = []
- buildRequires = [ 'libtool:runtime', 'glib:devel', 'freetype:devel',
- 'fontconfig:devel', 'zlib:devel', 'expat:devel',
- 'pkg-config:devel', 'cairo:devel', 'libpng:devel',
- 'perl:runtime', 'libX11:devel', 'libICE:devel',
- 'libSM:devel', 'libXft:devel', 'imake:runtime',
- 'libXext:devel', 'libXrender:devel', 'libXau:devel',
- 'libXdmcp:devel', 'libXt:devel', ]
+ buildRequires = [
+ 'libtool:runtime', 'glib:devel', 'freetype:devel',
+ 'fontconfig:devel', 'zlib:devel', 'expat:devel',
+ 'pkg-config:devel', 'cairo:devel', 'libpng:devel',
+ 'perl:runtime', 'libX11:devel', 'libICE:devel', 'libSM:devel',
+ 'libXft:devel', 'imake:runtime', 'libXext:devel',
+ 'libXrender:devel', 'libXau:devel', 'libXdmcp:devel',
+ 'libXt:devel', 'libXi:devel', 'libXmu:devel',
+ 'util-linux-ng:devel'
+ ]
- if Arch.x86_64:
- buildRequires.extend(['multiarch_wrapper:runtime'])
-
- extraConfig = GnomePackageRecipe.extraConfig + ' --build=%(host)s'
-
- buildMultiarch = True
+ shortDesc = 'Internationalized text layout and rendering library'
+ url = 'http://www.pango.org/'
+ licenses = [ 'LGPL-2', 'FTL' ]
+ categories = [ 'X' ]
def unpack(r):
GnomePackageRecipe.unpack(r)
- r.addPatch('pango-1.24.5-multilib-1.patch', use=Arch.x86_64)
+ r.addPatch('pango-1.2.5-lib64.patch', use=Arch.x86_64)
r.addSource('pangomodule.tagdescription', macros=True,
dest='%(tagdescriptiondir)s/pangomodule')
if Arch.x86_64:
@@ -37,53 +39,13 @@
r.addSource('pangomodule-32.taghandler', macros=True,
dest='%(taghandlerdir)s/pangomodule', mode=0755)
-
- r.buildEnvReplaceFiles = [
- 'pango/pango-utils.c',
- 'modules/Makefile.am',
- 'modules/Makefile.in',
- 'pango/Makefile.am',
- 'pango/Makefile.in',
- ]
-
- def build32bit(r):
- # First build 32bit version
- macros32 = r.macros.copy()
- macros32.cc = '"gcc -m32"'
- macros32.cxx = '"g++ -m32"'
- macros32.libdir = '%(prefix)s/lib'
- macros32.host = '%(target32)s'
-
- r.Run('cp -a %(builddir)s %(builddir)s/../32bit')
-
- for f in r.buildEnvReplaceFiles:
- r.Replace('BUILDENV', '32', '../32bit/' + f)
- r.Replace('BUILDENV', '64', f)
-
- r.Configure(r.extraConfig, dir='../32bit', overrideMacros=macros32,
- preConfigure=('USE_ARCH=32 ' + r.preConfigure))
- r.Make(r.makeArgs, dir='../32bit', overrideMacros=macros32,
- preMake=('USE_ARCH=32 ' + r.preMake))
- r.MakeInstall(r.makeInstallArgs, dir='../32bit',
overrideMacros=macros32,
- preMake=('USE_ARCH=32 ' + r.preMakeInstall))
- r.Move('%(bindir)s/pango-querymodules',
'%(bindir)s/pango-querymodules-32')
- r.ComponentSpec('lib', '%(bindir)s/pango-querymodules-32')
- r.Create('%(sysconfdir)s/pango-32/pango.modules')
- r.ComponentSpec('lib', '%(sysconfdir)s/pango-32/pango.modules')
- r.NormalizePkgConfig(exceptions='.*')
-
def policy(r):
if Arch.x86_64:
- r.Move('%(bindir)s/pango-querymodules',
'%(bindir)s/pango-querymodules-64')
- r.ComponentSpec('lib', '%(bindir)s/pango-querymodules-64')
- r.Symlink('%(bindir)s/multiarch_wrapper',
'%(bindir)s/pango-querymodules')
- r.DanglingSymlinks(exceptions='%(bindir)s/pango-querymodules')
-
- r.Create('%(sysconfdir)s/pango-64/pango.modules')
- r.ComponentSpec('lib', '%(sysconfdir)s/pango-64/pango.modules')
- r.Remove('%(sysconfdir)s/pango/pango.modules')
- else:
- r.ComponentSpec('lib', '%(sysconfdir)s/pango/pango.modules')
+ r.MakeDirs('%(sysconfdir)s/pango/%(host)s')
+ r.ExcludeDirectories(exceptions='%(sysconfdir)s/pango/%(host)s')
+ r.Remove('%(sysconfdir)s/pango/%(host)s/pango.modules')
+ r.Remove('%(sysconfdir)s/pango/pango.modules')
+ r.ExcludeDirectories(exceptions='%(sysconfdir)s/pango')
r.ComponentSpec('lib', '%(bindir)s/pango-querymodules')
pango-1.2.5-lib64.patch: new
--- /dev/null
+++ pango-1.2.5-lib64.patch
@@ -0,0 +30 @@
+#--- pango-1.2.5/pango/Makefile.am.lib64 2003-08-25 10:12:45.000000000
-0400
+#+++ pango-1.2.5/pango/Makefile.am 2003-12-08 18:43:51.000000000 -0500
+#@@ -16,6 +16,7 @@
+# -DPANGO_ENABLE_BACKEND \
+# -DPANGO_ENABLE_ENGINE \
+# -DSYSCONFDIR=\"$(sysconfdir)\" \
+#+ -DHOST=\"$(host_triplet)\" \
+# -DLIBDIR=\"$(libdir)\" \
+# -DMODULE_VERSION=\"$(PANGO_MODULE_VERSION)\" \
+# -DG_DISABLE_DEPRECATED \
+--- pango-1.2.5/pango/modules.c.lib64 2002-12-06 19:54:27.000000000 -0500
++++ pango-1.2.5/pango/modules.c 2003-12-08 18:43:51.000000000 -0500
+@@ -353,6 +353,7 @@
+
+ if (!file_str)
+ file_str = g_build_filename (pango_get_sysconf_subdirectory (),
++ HOST,
+ "pango.modules",
+ NULL);
+
+--- pango-1.2.5/pango/Makefile.in.lib64 2003-12-09 10:48:24.000000000
-0500
++++ pango-1.2.5/pango/Makefile.in 2003-12-09 10:48:32.000000000 -0500
+@@ -135,6 +135,7 @@
+ -DPANGO_ENABLE_BACKEND \
+ -DPANGO_ENABLE_ENGINE \
+ -DSYSCONFDIR=\"$(sysconfdir)\" \
++ -DHOST=\"$(host_triplet)\" \
+ -DLIBDIR=\"$(libdir)\" \
+ -DMODULE_VERSION=\"$(PANGO_MODULE_VERSION)\" \
+ -DG_DISABLE_DEPRECATED \
pangomodule-32.taghandler: removed
pango-1.24.5-multilib-1.patch: removed
pangomodule-64.taghandler: removed
Committed by: brcha
Other related posts:
- » [weasel-commit] Source: pango=1.24.5-2 - rbuilder
