samba: build with needed packages

[people/amarx/ipfire-3.x.git] / e2fsprogs / e2fsprogs.nm

diff --git a/e2fsprogs/e2fsprogs.nm b/e2fsprogs/e2fsprogs.nm
index 1fce087e9feab631e7f46465b714ba645d6ea341..f938eef9d10903c0a583fec978fd94801031b42c 100644 (file)
--- a/e2fsprogs/e2fsprogs.nm
+++ b/e2fsprogs/e2fsprogs.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = e2fsprogs
-version    = 1.41.11
+version    = 1.42.13
 release    = 1
 
 groups     = System/Filesystems
@@ -13,12 +13,12 @@ license    = GPLv2
 summary    = Utilities for managing the extended (ext2/ext3/ext4) filesystems.
 
 description
-       The e2fsprogs package contains a number of utilities for creating, \
-       checking, modifying, and correcting any inconsistencies in second \
+       The e2fsprogs package contains a number of utilities for creating,
+       checking, modifying, and correcting any inconsistencies in second
        and third extended (ext2/ext3) filesystems.
 end
 
-source_dl  =
+source_dl  = http://prdownloads.sourceforge.net/%{name}/
 
 build
        requires
@@ -26,15 +26,12 @@ build
                libselinux-devel
                libsepol-devel
                libuuid-devel
+               psmisc
        end
 
        prepare_cmds
                mkdir -pv %{DIR_APP}/build
 
-               # Fix DT_TEXTREL in e2fsprogs libraries. --disable-shared and
-               # --with-pic are not options in E2fsprogs:
-               find lib/ -name Makefile.in -exec sed -i "s/\%{ALL_CFLAGS}/& -fPIC/" {} \;
-
                # At run time libblkid looks for the BLKID_DEBUG environment variable to
                # enable debbugging, with getenv(3). Some suid-root programs use libblkid,
                # such as mount(1). e2fsprogs includes a safe_getenv() function, which calls
@@ -42,36 +39,36 @@ build
                # variables if the user is suid or sgid. So, this command replaces getenv()
                # with safe_getenv():
                sed \
-                       -e "s/getenv(\"BLKID_DEBUG\")/safe_getenv(\"BLKID_DEBUG\")/" \
+                       -e 's/getenv("BLKID_DEBUG")/safe_getenv("BLKID_DEBUG")/' \
                        -i lib/blkid/cache.c
        end
 
+       configure_options += \
+               --with-root-prefix="" \
+               --enable-elf-shlibs \
+               --disable-libblkid \
+               --disable-fsck \
+               --disable-uuidd \
+               --disable-libuuid
+
        build
                cd build
                ../configure \
-                       --prefix=/usr \
-                       --with-root-prefix="" \
-                       --enable-elf-shlibs \
-                       --disable-libblkid \
-                       --disable-fsck \
-                       --disable-uuidd \
-                       --disable-libuuid
+                       %{configure_options}
 
                make %{PARALLELISMFLAGS}
        end
 
        test
+               # Create empty mtab file if it does not exist.
+               [ -e /etc/mtab ] || touch /etc/mtab
+
                cd build && make check
        end
 
        install
                cd build
                make install install-libs DESTDIR=%{BUILDROOT}
-
-               ln -svf ../../lib/libcom_err.so.2 %{BUILDROOT}/usr/lib/libcom_err.so
-               ln -svf ../../lib/libe2p.so.2 %{BUILDROOT}/usr/lib/libe2p.so
-               ln -svf ../../lib/libext2fs.so.2 %{BUILDROOT}/usr/lib/libext2fs.so
-               ln -svf ../../lib/libss.so.2 %{BUILDROOT}/usr/lib/libss.so
        end
 end
 
@@ -79,8 +76,72 @@ packages
        package %{name}
                groups += Base
        end
-       
+
+       package %{name}-libs
+               template LIBS
+       end
+
        package %{name}-devel
                template DEVEL
+
+               requires
+                       libcom_err-devel
+                       libss-devel
+               end
+       end
+
+       package libcom_err
+               summary = Common error description library.
+               description
+                       This is the common error description library, part of e2fsprogs.
+               end
+
+               files
+                       %{libdir}/libcom_err.so.*
+               end
+       end
+
+       package libcom_err-devel
+               summary = Development files for libcom_err.
+               description = %{summary}
+
+               files
+                       %{bindir}/compile_et
+                       %{libdir}/libcom_err.so
+                       %{libdir}/pkgconfig/com_err.pc
+                       %{includedir}/com_err.h
+                       %{includedir}/et
+                       %{datadir}/et
+                       %{mandir}/man1/compile_et.1*
+                       %{mandir}/man3/com_err.3*
+               end
+       end
+
+       package libss
+               summary = Command line interface parsing library.
+               description
+                       This is libss, a command line interface parsing library, part of e2fsprogs.
+               end
+
+               files
+                       %{libdir}/libss.so.*
+               end
+       end
+
+       package libss-devel
+               summary = Development files for libss.
+               description = %{summary}
+
+               files
+                       %{bindir}/mk_cmds
+                       %{libdir}/libss.so
+                       %{libdir}/pkgconfig/ss.pc
+                       %{includedir}/ss
+                       %{datadir}/ss
+                       %{mandir}/man1/mk_cmds.1*
+               end
+       end
+       package %{name}-debuginfo
+               template DEBUGINFO
        end
 end