[weasel-commit] Source: e2fsprogs=1.41.11-1

================================
e2fsprogs:source=1.41.11-1 (previous: 1.41.9-2)
cvc rdiff e2fsprogs -1 /weasel.rpath.org@wgl:3-devel/1.41.11-1
================================
1.41.11-1 Filip Brcic (brcha@xxxxxxxxxxxx) Mon Aug  2 21:42:44 2010
    version bump

e2fsprogs-1.41.11.tar.gz: new
e2fsprogs.recipe: changed
Index: e2fsprogs.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- e2fsprogs.recipe /weasel.rpath.org@wgl:3-devel/1.41.9-2
+++ e2fsprogs.recipe /weasel.rpath.org@wgl:3-devel/1.41.11-1
@@ -1,19 +1,29 @@
 #
-# Copyright (c) 2008,2009 Filip Brcic <brcha@xxxxxxx>
+# Copyright (c) 2008-2010 Filip Brcic <brcha@xxxxxxx>
 # Distributed under the terms of the GNU General Public License v3
 #
 
 class E2fsprogs(AutoPackageRecipe):
     name = 'e2fsprogs'
-    version = '1.41.9'
+    version = '1.41.11'
 
     buildRequires = [
-        'gettext:runtime', 'intltool:runtime', 'util-linux-ng:devel',
-        'install-info:runtime', 'pkg-config:devel', 'texinfo:runtime',
+        'gettext:runtime', 'intltool:runtime',
+        'perl-XML-Parser:perl', 'gettext:devel', 'intltool:devel',
+        'util-linux-ng:devel', 'install-info:runtime',
+        'pkg-config:devel', 'texinfo:runtime', 'e2fsprogs-libs:devel',
         ]
 
-    shortDesc  = 'Extended 2 file system utilities'
-    longDesc   = 'The E2fsprogs package contains the utilities for handling 
the ext2 file system. It also supports the ext3 journaling file system.'
+    runtimeRequires = [
+        'e2fsprogs-libs:runtime', 'util-linux-ng:runtime',
+        ]
+    buildRequires.extend(runtimeRequires)
+
+    shortDesc  = 'Standard EXT2/EXT3/EXT4 file system utilities'
+    longDesc   = """
+The E2fsprogs package contains the utilities for handling the ext2
+file system. It also supports the ext3 and ext4 file systems.
+"""
     url        = 'http://e2fsprogs.sourceforge.net'
     licenses   = [ 'GPL-2', 'BSD' ]
     categories = [ 'System' ]
@@ -29,34 +39,42 @@
                   '$(LN_S) -f ',
                   '{e2fsck,misc}/Makefile.in')
 
-        r.extraConfig = (
-            ' --with-root-prefix=""'
-            ' --enable-elf-shlibs'
-            ' --with-cc=%(cc)s'
-            ' --disable-libblkid'
-            ' --disable-libuuid'
-            ' --disable-fsck'
-            ' --disable-uuidd'
-            )
+        # blargh ... trick e2fsprogs into using e2fsprogs-libs
+        r.Remove('doc', recursive=True)
+
+        r.Replace('@LIBINTL@', '@LTLIBINTL@',
+                  'MCONFIG.in')
+        r.Replace(r'[$][(]LIB[)]/lib([^@]*)@LIB_EXT@', r'-l\1',
+                  'MCONFIG.in',
+                  lines='^LIB(COM_ERR|SS)')
+        r.Replace('=.*', '=',
+                  'MCONFIG.in',
+                  lines='^DEPLIB(COM_ERR|SS)')
+        r.Replace('lib/(et|ss)', '',
+                  'Makefile.in',
+                  lines='^LIB_SUBDIRS')
+        # needs open64() prototype
+        r.Run("sed -i -e '/^#define _XOPEN/i#define _GNU_SOURCE' 
misc/mke2fs.c")
+
+        # Avoid rebuild
+        r.Run('touch lib/ss/ss_err.h')
 
     def configure(r):
         r.Configure(
             ' --with-root-prefix=/'
             ' --enable-elf-shlibs'
-            ' --with-ldopts="%(ldflags)s"'
             ' --without-included-gettext'
             ' --enable-nls'
             ' --disable-libblkid'
             ' --disable-libuuid'
             ' --disable-fsck'
-            ' --disable-uuidd'
+            ' --disable-uuidd',
+            preConfigure='ac_cv_path_LDCONFIG=:'
             )
 
     def make(r):
         r.Make(
             ' COMPILE_ET=compile_et MK_CMDS=mk_cmds'
-            ' LIBUUID="-luuid" STATIC_LIBUUID="-luuid"'
-            ' LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid"'
             )
 
     def makeinstall(r):
@@ -69,7 +87,5 @@
         r.addSource('e2fsck.conf', dir='%(sysconfdir)s')
 
     def policy(r):
-        # krb5 needs this to be in system include dirs
-        r.Copy('%(includedir)s/et/com_err.h', '%(includedir)s/')
-
-
+        for req in r.runtimeRequires:
+            r.Requires(req, '%(bindir)s/')


e2fsprogs-1.41.9.tar.gz: removed

Committed by: brcha

Other related posts:

  • » [weasel-commit] Source: e2fsprogs=1.41.11-1 - rbuilder