- up to 2.23.2

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

diff --git a/util-linux.spec b/util-linux.spec
index 269d7d5ff6c180621c98a41862b887433aad1f52..2ddd33705c22e2a24834ec698b290d1e6a0b0f6d 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.23.1
-Release:       2
+Version:       2.23.2
+Release:       1
 License:       GPL
 Group:         Applications/System
 Source0:       https://www.kernel.org/pub/linux/utils/util-linux/v2.23/%{name}-%{version}.tar.xz
-# Source0-md5: 33ba55ce82f8e3b8d7a38fac0f62779a
+# Source0-md5: b39fde897334a4858bb2098edcce5b3f
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 3c940c7e7fe699eaa2ddb1bffb3de2fe
 Source2:       login.pamd
@@ -529,7 +529,7 @@ Requires(pre):      /usr/sbin/groupadd
 Requires(pre): /usr/sbin/groupmod
 Requires(pre): /usr/sbin/useradd
 Requires(pre): /usr/sbin/usermod
-Requires(post,preun,postun):    systemd-units >= 38
+Requires(post,preun,postun):   systemd-units >= 38
 Requires:      libuuid = %{version}-%{release}
 Requires:      systemd-units >= 38
 Provides:      group(uuidd)
@@ -630,11 +630,14 @@ Pakiet ten zawiera narzędzie blkid do rozpoznawania partycji przez
 etykietę lub UUID - statycznie skonsolidowane na potrzeby initrd.
 
 %package -n bash-completion-util-linux
-Summary:        bash completion for util-linux commands
-Summary(pl.UTF-8):      Bashowe dopełnianie parametrów dla poleceń z pakietu util-linux
-Group:          Applications/Shells
-Requires:       %{name} = %{version}-%{release}
-Requires:       bash-completion >= 2.0
+Summary:       bash completion for util-linux commands
+Summary(pl.UTF-8):     Bashowe dopełnianie parametrów dla poleceń z pakietu util-linux
+Group:         Applications/Shells
+Requires:      %{name} = %{version}-%{release}
+Requires:      bash-completion >= 2.0
+%if "%{_rpmversion}" >= "5"
+BuildArch:     noarch
+%endif
 
 %description -n bash-completion-util-linux
 Bash completion for util-linux commands.
@@ -642,7 +645,6 @@ Bash completion for util-linux commands.
 %description -n bash-completion-util-linux -l pl.UTF-8
 Bashowe dopełnianie parametrów dla poleceń z pakietu util-linux.
 
-
 %prep
 %setup -q -a1
 #%patch0 -p1
@@ -656,7 +658,7 @@ Bashowe dopełnianie parametrów dla poleceń z pakietu util-linux.
 %patch9 -p1
 %{?with_initrd:%patch10 -p1}
 
-install %{SOURCE10} nologin.c
+cp -p %{SOURCE10} nologin.c
 
 %{__rm} po/stamp-po
 
@@ -775,8 +777,8 @@ install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,sysconfig,init,security} \
 mv $RPM_BUILD_ROOT%{_sbindir}/{addpart,delpart,partx} $RPM_BUILD_ROOT/sbin
 mv $RPM_BUILD_ROOT/sbin/raw $RPM_BUILD_ROOT%{_bindir}
 
-install nologin $RPM_BUILD_ROOT/sbin
-install %{SOURCE11} $RPM_BUILD_ROOT%{_mandir}/man8
+install -p nologin $RPM_BUILD_ROOT/sbin
+cp -p %{SOURCE11} $RPM_BUILD_ROOT%{_mandir}/man8
 
 cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/login
 install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/blockdev
@@ -809,7 +811,7 @@ for d in cs de es fi fr hu id it ja ko nl pl ; do
        for m in man1 man5 man8 ; do
                if [ -d man/$d/$m ]; then
                        install -d $RPM_BUILD_ROOT%{_mandir}/$d/$m
-                       cp -a man/$d/$m/* $RPM_BUILD_ROOT%{_mandir}/$d/$m
+                       cp -p man/$d/$m/* $RPM_BUILD_ROOT%{_mandir}/$d/$m
                fi
        done
 done