C: *SysVinit having /bin/mountpoint belong to mount, removed lib{blkid,mount}.la

[packages/util-linux.git] / util-linux.spec

diff --git a/util-linux.spec b/util-linux.spec
index 9907615eafa9038618edf2f56523841fe57f6de6..60bceb46e384b14ca022f8103d5c35a8aa71a7e6 100644 (file)
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -36,12 +36,12 @@ Summary(ru.UTF-8):  Набор базовых системных утилит д
 Summary(tr.UTF-8):     Temel sistem araçları
 Summary(uk.UTF-8):     Набір базових системних утиліт для Linux
 Name:          util-linux
-Version:       2.24
+Version:       2.24.2
 Release:       1
 License:       GPL
 Group:         Applications/System
 Source0:       https://www.kernel.org/pub/linux/utils/util-linux/v2.24/%{name}-%{version}.tar.xz
-# Source0-md5: 4fac6443427f575fc5f3531a4ad2ca01
+# Source0-md5: 3f191727a0d28f7204b755cf1b6ea0aa
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 3c940c7e7fe699eaa2ddb1bffb3de2fe
 Source2:       login.pamd
@@ -54,12 +54,13 @@ Source8:    runuser.pamd
 Source9:       runuser-l.pamd
 Source10:      nologin.c
 Source11:      nologin.8
+Source12:      blockdev.service
+Source13:      blockdev.sh
 Patch0:                %{name}-pl.po-update.patch
 Patch1:                %{name}-ng-union-mount.patch
 
 Patch3:                %{name}-fdformat-ide.patch
 Patch4:                %{name}-fhs.patch
-Patch5:                %{name}-hotkeys.patch
 Patch7:                %{name}-login-lastlog.patch
 Patch8:                %{name}-procpartitions.patch
 Patch9:                su-paths.patch
@@ -72,6 +73,7 @@ BuildRequires:        gettext-devel >= 0.14.1
 %{?with_fallocate:BuildRequires:       glibc-devel >= 6:2.11}
 BuildRequires: gtk-doc >= 1.10
 BuildRequires: gtk-doc-automake >= 1.10
+BuildRequires: libcap-ng-devel
 %{?with_selinux:BuildRequires: libselinux-devel >= 2.0}
 %{?with_selinux:BuildRequires: libsepol-devel}
 BuildRequires: libtool >= 2:2.2
@@ -81,7 +83,7 @@ BuildRequires:        pam-devel >= %{pam_ver}
 BuildRequires: pkgconfig
 BuildRequires: python3-devel
 BuildRequires: rpm >= 4.4.9-56
-BuildRequires: rpmbuild(macros) >= 1.470
+BuildRequires: rpmbuild(macros) >= 1.671
 BuildRequires: sed >= 4.0
 BuildRequires: tar >= 1:1.22
 BuildRequires: udev-devel
@@ -116,11 +118,10 @@ Obsoletes:        sparc32
 Obsoletes:     util-linux-chkdupexe
 Obsoletes:     util-linux-ng < 2.20-1
 Obsoletes:     util-linux-suids
-Conflicts:     SysVinit < 2.86-26
 Conflicts:     SysVinit-tools < 2.88-15
 Conflicts:     e2fsprogs < 1.41.8-5
+Conflicts:     rc-scripts < 0.4.9-2
 Conflicts:     shadow-extras < 1:4.0.3-6
-Conflicts:     upstart-SysVinit < 2.86-28
 %if %{with su}
 Conflicts:     coreutils < 8.19
 %endif
@@ -195,8 +196,10 @@ Summary:   Support for blockdev
 Summary(pl.UTF-8):     Obsługa blockdev
 Group:         Applications/System
 Requires(post,preun):  /sbin/chkconfig
+Requires(post,preun,postun):   systemd-units >= 38
 Requires:      coreutils
 Requires:      rc-scripts >= 0.4.3.0
+Requires:      systemd-units >= 38
 
 %description -n blockdev
 The utility blockdev allows one to call block device ioctls from the
@@ -287,6 +290,7 @@ Summary(uk.UTF-8):  Програми для монтування та розмо
 Group:         Applications/System
 Requires:      libmount = %{version}-%{release}
 Conflicts:     SysVinit < 2.86-26
+Conflicts:     upstart-SysVinit < 2.86-28
 # C: nfs-utils-common is opposite to http://cvs.pld-linux.org/packages/nfs-utils/nfs-utils.spec?r1=1.165&r2=1.166
 Conflicts:     nfs-utils-common < 1.1.3-3
 
@@ -665,7 +669,6 @@ Wiązania Pythona 3.x do biblioteki libmount.
 
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
@@ -728,7 +731,8 @@ export CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses -DHAVE_LSEEK64_PROTOTYPE
        --disable-wall \
        --without-audit \
        --without-ncurses \
-       --without-selinux
+       --without-selinux \
+       --without-smack
 
 # configure gets it unconditionally wrong
 %{__sed} -i -e 's/#define HAVE_WIDECHAR 1//' config.h
@@ -773,7 +777,8 @@ export CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses -DHAVE_LSEEK64_PROTOTYPE
        --with-python=3 \
        --with-audit \
        --with-bashcompletiondir=/usr/share/bash-completion/completions \
-       --with-selinux%{!?with_selinux:=no}
+       --with-selinux%{!?with_selinux:=no} \
+       --with-smack
 
 %{__make}
 
@@ -782,7 +787,8 @@ export CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses -DHAVE_LSEEK64_PROTOTYPE
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,sysconfig,init,security} \
-       $RPM_BUILD_ROOT{/%{_lib},/var/{lock,lib/libuuid}}
+       $RPM_BUILD_ROOT{/%{_lib},/var/{lock,lib/libuuid}} \
+       $RPM_BUILD_ROOT{/lib/systemd/pld-helpers.d,%{systemdunitdir}}
 %{?with_dietlibc:install -d $RPM_BUILD_ROOT%{dietlibdir}}
 
 %{__make} install \
@@ -798,8 +804,10 @@ cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/login
 install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/blockdev
 cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/blockdev
 cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/init/blockdev.conf
+cp -p %{SOURCE12} $RPM_BUILD_ROOT%{systemdunitdir}/blockdev.service
+cp -p %{SOURCE13} $RPM_BUILD_ROOT/lib/systemd/pld-helpers.d/blockdev.sh
 %if %{with su}
-ln -s ../sbin/runuser  $RPM_BUILD_ROOT/bin/runuser
+ln -s ../sbin/runuser $RPM_BUILD_ROOT/bin/runuser
 cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/pam.d/su
 cp -p %{SOURCE7} $RPM_BUILD_ROOT/etc/pam.d/su-l
 cp -p %{SOURCE8} $RPM_BUILD_ROOT/etc/pam.d/runuser
@@ -816,10 +824,11 @@ for lib in blkid uuid mount; do
                 $RPM_BUILD_ROOT%{_libdir}/lib${lib}.so
 done
 
-ln -sf hwclock $RPM_BUILD_ROOT/sbin/clock
+ln -s hwclock $RPM_BUILD_ROOT/sbin/clock
 echo '.so man8/hwclock.8' > $RPM_BUILD_ROOT%{_mandir}/man8/clock.8
 
 ln -s utmpdump $RPM_BUILD_ROOT%{_bindir}/utmpx-dump
+ln -s mkswap $RPM_BUILD_ROOT/sbin/mkfs.swap
 
 for d in cs de es fi fr hu id it ja ko nl pl ; do
        for m in man1 man5 man8 ; do
@@ -871,6 +880,7 @@ ln -s fsck $RPM_BUILD_ROOT%{_libdir}/initrd/e2fsck
 
 # We don't need those
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/initrd/{cal,col,colcrt,colrm,column,ctrlaltdel,cytune,dmesg,flock,fsfreeze,fstrim,getopt,hexdump,ipcmk,ipcrm,ipcs,isosize,logger,lslocks,mcookie,mkfs*,readprofile,renice,rev,rtcwake,script,scriptreplay,setsid,tailf,tunelp,wdctl,whereis}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib{blkid,mount}.la
 
 %if %{with dietlibc}
 cp -a initrd/%{_lib}/lib*.a $RPM_BUILD_ROOT%{dietlibdir}
@@ -885,12 +895,20 @@ rm -rf $RPM_BUILD_ROOT
 %post -n blockdev
 /sbin/chkconfig --add blockdev
 %service blockdev restart
+%systemd_post blockdev.service
 
 %preun -n blockdev
 if [ "$1" = "0" ]; then
        %service blockdev stop
        /sbin/chkconfig --del blockdev
 fi
+%systemd_preun blockdev.service
+
+%postun -n blockdev
+%systemd_reload
+
+%triggerpostun -n blockdev -- blockdev < 2.24-4
+%systemd_trigger blockdev.service
 
 %post  -n libblkid -p /sbin/ldconfig
 %postun -n libblkid -p /sbin/ldconfig
@@ -900,18 +918,18 @@ fi
 
 %pre    -n uuidd
 if [ "$(getgid libuuid 2>/dev/null)" = "222" ]; then
-        /usr/sbin/groupmod -n uuidd libuuid
+       /usr/sbin/groupmod -n uuidd libuuid
 fi
 %groupadd -g 222 uuidd
 if [ "$(id -u libuuid 2>/dev/null)" = "222" ]; then
-        /usr/sbin/usermod -l uuidd libuuid
+       /usr/sbin/usermod -l uuidd libuuid
 fi
 %useradd -u 222 -r -d /var/lib/libuuid -s /bin/false -c "UUID generator helper daemon" -g uuidd uuidd
 
 %postun -n uuidd
 if [ "$1" = "0" ]; then
-        %userremove uuidd
-        %groupremove uuidd
+       %userremove uuidd
+       %groupremove uuidd
 fi
 
 %post  -n libmount -p /sbin/ldconfig
@@ -985,6 +1003,7 @@ fi
 %attr(755,root,root) /sbin/fsfreeze
 %attr(755,root,root) /sbin/fstrim
 %attr(755,root,root) /sbin/mkfs
+%attr(755,root,root) /sbin/mkfs.swap
 %attr(755,root,root) /sbin/mkswap
 %attr(755,root,root) /sbin/sulogin
 %attr(755,root,root) /sbin/swaplabel
@@ -1362,6 +1381,8 @@ fi
 %attr(755,root,root) /sbin/blockdev
 %{_mandir}/man8/blockdev.8*
 %lang(ja) %{_mandir}/ja/man8/blockdev.8*
+%{systemdunitdir}/blockdev.service
+%attr(755,root,root) /lib/systemd/pld-helpers.d/blockdev.sh
 
 %files -n mount
 %defattr(644,root,root,755)
@@ -1470,7 +1491,6 @@ fi
 %files -n libblkid-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libblkid.so
-%{_libdir}/libblkid.la
 %{_includedir}/blkid
 %{_pkgconfigdir}/blkid.pc
 %{_mandir}/man3/libblkid.3*
@@ -1533,7 +1553,6 @@ fi
 %files -n libmount-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libmount.so
-%{_libdir}/libmount.la
 %{_includedir}/libmount
 %{_pkgconfigdir}/mount.pc