ccache: Update to 3.7.1

[ipfire-3.x.git] / util-linux / util-linux.nm

diff --git a/util-linux/util-linux.nm b/util-linux/util-linux.nm
index 676683d6607042a8dcb40d356a114b4d19a22dae..9d4c1a4475f3f197143cd2dea0377991e593a439 100644 (file)
--- a/util-linux/util-linux.nm
+++ b/util-linux/util-linux.nm
@@ -4,12 +4,15 @@
 ###############################################################################
 
 name       = util-linux
-major_ver  = 2.22
-version    = %{major_ver}
+major_ver  = 2.30
+minor_ver  = 1
+#version    = %{major_ver}
+version    = %{major_ver}.%{minor_ver}
 release    = 1
 
+maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
 groups     = System/Base
-url        = http://kernel.org/~kzak/util-linux/
+url        = https://github.com/karelzak/util-linux
 license    = GPLv2 and GPLv2+ and BSD with advertising and Public Domain
 summary    = A collection of basic system utilities.
 
@@ -20,19 +23,20 @@ description
        program.
 end
 
-source_dl  = ftp://ftp.kernel.org/pub/linux/utils/util-linux/v%{major_ver}/
+source_dl  = https://www.kernel.org/pub/linux/utils/%{name}/v%{major_ver}/
 
 build
        requires
-               audit-devel
+               automake >= 1.15
                coreutils >= 8.19
                gettext
                libcap-devel
-               libselinux-devel
-               libsepol-devel
+               libcap-ng-devel
+               libudev-devel
                ncurses-devel
                pam-devel
-               libudev-devel
+               python3-devel
+               systemd-devel >= 215
                zlib-devel
        end
 
@@ -48,14 +52,14 @@ build
                --enable-kill \
                --enable-partx \
                --enable-write \
+               --enable-runuser \
                --enable-su \
-               --enable-socket-activation \
-               --enable-libmount-mount \
-               --with-selinux \
-               --with-audit \
+               --with-systemd \
                --with-udev \
                --disable-makeinstall-chown \
-               --disable-static
+               --disable-static \
+               --disable-rpath \
+               --with-python=3
 
        prepare_cmds
                sed -e 's@etc/adjtime@var/lib/hwclock/adjtime@g' \
@@ -64,7 +68,7 @@ build
 
        # Build nolodin
        build_cmds
-               gcc %{CFLAGS} -o nologin %{DIR_SOURCE}/nologin.c
+               gcc %{CFLAGS} %{LDFLAGS} -o nologin %{DIR_SOURCE}/nologin.c
        end
 
        install_cmds
@@ -122,6 +126,7 @@ packages
                        /sbin/findfs
                        /sbin/fsck
                        /sbin/nologin
+                       /sbin/runuser
                end
 
                obsoletes
@@ -131,10 +136,11 @@ packages
 
                conflicts
                        filesystem < 002
+                       bash-completion <= 2.1-2
                        coreutils < 8.19
                        setup < 3.0-2
                        util-linux-ng
-                       sysvinit <= 2.86-2
+                       sysvinit <= 2.86-6
                end
 
                preprequires += coreutils
@@ -240,6 +246,53 @@ packages
                end
        end
 
+       # Package information for libsmartcols.
+       package libsmartcols
+               summary = Formatting library for ls-like programs.
+               description
+                       This is a library for ls-like terminal
+                       programs, part of util-linux.
+               end
+
+               files
+                       %{libdir}/libsmartcols.*
+               end
+       end
+
+       # Package information for libsmartcols-devel.
+       package libsmartcols-devel
+               summary = Development library and header of libsmartcols.
+               description = %{summary}
+
+               files
+                       %{includedir}/libsmartcols/*
+                       %{libdir}/libsmartcols.so
+                       %{libdir}/pkgconfig/smartcols.pc
+               end
+       end
+
+       # Package information for libfdisk.
+       package libfdisk
+               summary = Partitioning library for fdisk-like programs.
+               description = %{summary}
+
+               files
+                       %{libdir}/libfdisk.*
+               end
+       end
+
+       # Package information for libfdisk-devel.
+       package libfidsk-devel
+               summary = Development library and headers of libfdisk.
+               description = %{summary}
+
+               files
+                       %{includedir}/libfdisk/*
+                       %{libdir}/libfdisk.so
+                       %{libdir}/pkgconfig/fdisk.pc
+               end
+       end
+
        package uuidd
                summary = Helper daemon to guarantee uniqueness of time-based UUIDs.
                description
@@ -260,6 +313,10 @@ packages
 
                prerequires += shadow-utils
 
+               requires
+                       systemd-libs >= 215
+               end
+
                script prein
                        getent group uuidd >/dev/null || groupadd -r uuidd
                        getent passwd uuidd >/dev/null || \
@@ -286,6 +343,10 @@ packages
                        systemctl try-restart uuidd.service >/dev/null 2>&1 || :
                end
        end
+
+       package python3-libmount
+               template PYTHON3
+       end
        
        package %{name}-debuginfo
                template DEBUGINFO