- added systemd service for blockdev

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

diff --git a/util-linux.spec b/util-linux.spec
index 22ad0e12feab3cda14a64e13ca579ea31a62aff7..91d3902c0a54ea4316318505e6c8b7b069488b00 100644 (file)
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -37,7 +37,7 @@ Summary(tr.UTF-8):    Temel sistem araçları
 Summary(uk.UTF-8):     Набір базових системних утиліт для Linux
 Name:          util-linux
 Version:       2.24
-Release:       1
+Release:       4
 License:       GPL
 Group:         Applications/System
 Source0:       https://www.kernel.org/pub/linux/utils/util-linux/v2.24/%{name}-%{version}.tar.xz
@@ -54,6 +54,8 @@ 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
 
@@ -72,6 +74,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 +84,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
@@ -119,6 +122,7 @@ 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}
@@ -195,8 +199,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
@@ -647,20 +653,20 @@ Bash completion for util-linux commands.
 Bashowe dopełnianie parametrów dla poleceń z pakietu util-linux.
 
 %package -n python3-libmount
-Summary:       libmount bindings
-Summary(pl.UTF-8):     Dowiązania do biblioteki libmount
+Summary:       Python 3.x libmount bindings
+Summary(pl.UTF-8):     Wiązania Pythona 3.x do biblioteki libmount
 Group:         Libraries/Python
 Requires:      libmount = %{version}-%{release}
 
 %description -n python3-libmount
-libmount bindings.
+Python 3.x libmount bindings.
 
 %description -n python3-libmount -l pl.UTF-8
-Dowiązania do biblioteki libmount.
+Wiązania Pythona 3.x do biblioteki libmount.
 
 %prep
 %setup -q -a1
-#%patch0 -p1
+%patch0 -p1
 %patch1 -p1
 
 %patch3 -p1
@@ -782,7 +788,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,6 +805,8 @@ 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
 cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/pam.d/su
@@ -816,10 +825,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
@@ -861,6 +871,8 @@ echo '.so man8/swapon.8' > $RPM_BUILD_ROOT%{_mandir}/pl/man8/swapoff.8
 # examples
 %{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}/getopt/getopt-parse.*sh
 
+%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/libmount/pylibmount.la
+
 %if %{with initrd}
 install -d $RPM_BUILD_ROOT%{_libdir}/initrd
 install -p initrd/bin/* $RPM_BUILD_ROOT%{_libdir}/initrd
@@ -883,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
@@ -983,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
@@ -1360,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)