[weasel-commit] Source: foomatic-filters=3.0_20080507-2

  • From: rbuilder@xxxxxxxxx
  • To: weasel-commit@xxxxxxxxxxxxx
  • Date: Thu, 17 Jun 2010 12:58:46 -0400

================================
foomatic-filters:source=3.0_20080507-2 (previous: 3.0_20080507-1)
cvc rdiff foomatic-filters -1 /weasel.rpath.org@wgl:3-devel/3.0_20080507-2
================================
3.0_20080507-2 Filip Brcic (brcha@xxxxxxxxxxxx) Thu Jun 17 12:57:59 2010
    foomatic-filters 3.0 20080507

foomatic-filters.recipe: changed
Index: foomatic-filters.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- foomatic-filters.recipe /weasel.rpath.org@wgl:3-devel/3.0_20080507-1
+++ foomatic-filters.recipe /weasel.rpath.org@wgl:3-devel/3.0_20080507-2
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009 Filip Brcic <brcha@xxxxxxx>
+# Copyright (c) 2009-2010 Filip Brcic <brcha@xxxxxxx>
 # Distributed under the terms of the GNU General Public License v3
 #
 
@@ -8,50 +8,45 @@
     version = '3.0_20080507'
 
     buildRequires = [
-        'cups:runtime', 'gettext:runtime', 'intltool:runtime', 'perl:devel',
+        'perl:devellib', 'intltool:runtime', 'perl-XML-Parser:perl',
+        'gettext:runtime', 'autoconf-wrapper:runtime',
+        'autoconf25:runtime', 'automake-wrapper:runtime',
+        'automake19:runtime', 'libtool:runtime', 'libtool:devel',
+        'm4:runtime', 'cups:devel',
         ]
+    runtimeRequires = [
+        'cups:runtime', 'perl:runtime', 'ghostscript:runtime',
+        ]
+    buildRequires.extend(runtimeRequires)
+
+    shortDesc  = 'Foomatic wrapper scripts'
+    longDesc   = """
+Foomatic is a database-driven system for integrating free software
+printer drivers with common spoolers under Unix.
+"""
+    url        = 'http://www.linuxprinting.org/foomatic.html'
+    licenses   = [ 'GPL-2' ]
+    categories = [ 'Network/Printing' ]
 
     def unpack(r):
-       r.Description(shortDesc='Foomatic wrapper scripts',
-                      longDesc='Foomatic is a database-driven system for 
integrating free software printer drivers with common spoolers under Unix.')
-       r.PackageURL('http://www.linuxprinting.org/foomatic.html')
-       r.Licenses('GPL-2')
         r.macros.version = r.version.replace('_', '-')
         r.addArchive(('http://gentooexperimental.org/~genstef/dist/',
                       'http://www.linuxprinting.org/download/foomatic/',
                       'mirror://gentoo/distfiles/'))
         r.addPatch('foomatic-filters-3.0.20060601-multilib.patch')
 
-        r.addAction('autoreconf -f -i')
+        r.Autoreconf(skipAutoheader=True)
 
+    def configure(r):
         r.macros.cups_serverbin = '$(cups-config --serverbin)'
 
-        r.preConfigure = (
-            ' CUPS_BACKEND=%(cups_serverbin)s/backend'
-            ' CUPS_FILTERS=%(cups_serverbin)s/filter'
-            ' CUPS=%(cups_serverbin)s/'
+        r.Configure(
+            preConfigure=(
+                ' CUPS_BACKEND=%(cups_serverbin)s/backend'
+                ' CUPS_FILTERS=%(cups_serverbin)s/filter'
+                ' CUPS=%(cups_serverbin)s/'
+                )
             )
-
-        r.extraConfig = ''
-
-        if Arch.x86_64:
-            # First build 32bit version
-            macros32 = r.macros.copy()
-            macros32.cc = '"gcc -m32"'
-            macros32.cxx = '"g++ -m32"'
-            macros32.libdir = '%(prefix)s/lib'
-
-            r.Run('cp -a %(builddir)s %(builddir)s/../32bit')
-
-            r.Configure(r.extraConfig, dir='../32bit', overrideMacros=macros32,
-                        preConfigure=('USE_ARCH=32 ' + r.preConfigure))
-            r.Make(dir='../32bit', overrideMacros=macros32, 
preMake='USE_ARCH=32')
-            r.MakeInstall(dir='../32bit', overrideMacros=macros32, 
preMake='USE_ARCH=32')
-
-           r.NormalizePkgConfig(exceptions='.*')
-
-    def configure(r):
-        r.Configure(r.extraConfig, preConfigure=r.preConfigure)
                     
     def policy(r):
         r.Symlink('%(bindir)s/foomatic-rip', '%(bindir)s/lpdomatic')
@@ -59,3 +54,6 @@
                   '%(cups_serverbin)s/filter/foomatic-gswrapper')
         r.Symlink('%(bindir)s/foomatic-rip',
                   '%(cups_serverbin)s/filter/cupsomatic')
+
+        for req in r.runtimeRequires:
+            r.Requires(req, '%(bindir)s/')



Committed by: brcha

Other related posts: