Accepting request 334018 from Base:System
1 OBS-URL: https://build.opensuse.org/request/show/334018 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=203
This commit is contained in:
parent
56c752d4f1
commit
23acdf291f
@ -1,3 +1,46 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 23 14:16:22 CEST 2015 - sbrabec@suse.com
|
||||
|
||||
- Update to version 2.27:
|
||||
* Many changes and improvements, most notably:
|
||||
* lsipc: new command
|
||||
* unshare provides a new option --propagation=
|
||||
* mount(8) supports read-only binds in one (not atomic) step by
|
||||
"bind,ro".
|
||||
* GNU readline support in fdisk and sfdisk.
|
||||
* JSON support in libsmartcols and findmnt, losetup, lsblk,
|
||||
lslocks, sfdisk and lsipc.
|
||||
* script has been massively improved to be more robust and less
|
||||
complex (bsc#888678, bsc#930236).
|
||||
* sulogin supports locked root accounts by --force.
|
||||
* colors support by default. It is possible to change this
|
||||
with --disable-colors-default.
|
||||
* more information in cfdisk
|
||||
* fdisk provides new commands 'F' and 'i'
|
||||
* cal supports the new options --twelve and --months <n>
|
||||
* rtcwake supports a news option --list-modes and --date, no
|
||||
support RTC_ALM_READ and RTC_ALM_SET fallbacks any more.
|
||||
* Many fixes, most notably:
|
||||
* fsck: now supports -r {fd} (bsc#903738)
|
||||
* better handling of multi-path devices
|
||||
(bsc#880468, bsc#924994)
|
||||
* flock: improve timeout handling (bsc#926945)
|
||||
* lsblk: display mountpoint even for top-level device
|
||||
(bsc#943415)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 19 21:18:11 CEST 2015 - sbrabec@suse.com
|
||||
|
||||
- Add licenses.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 4 20:31:55 CEST 2015 - sbrabec@suse.com
|
||||
|
||||
- Add %systemd_preset_pre and %systemd_preset_posttrans that will
|
||||
do one shot presetting of uuidd.service on upgrade.
|
||||
(bnc#900935#c46, FATE#318949).
|
||||
- Remove one shot presetting hacks.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon May 25 16:26:01 UTC 2015 - crrodriguez@opensuse.org
|
||||
|
||||
|
@ -121,7 +121,7 @@ BuildRequires: libmount-devel
|
||||
%endif
|
||||
%endif
|
||||
#END SECOND STAGE DEPENDENCIES
|
||||
Version: 2.26.2
|
||||
Version: 2.27
|
||||
Release: 0
|
||||
# util-linux is a base package and uuidd pre-requiring pwdutils pulls
|
||||
# that into the core build cycle. pwdutils also pulls in the whole
|
||||
@ -130,7 +130,7 @@ Release: 0
|
||||
# these tools as well
|
||||
#!BuildIgnore: pwdutils
|
||||
Url: https://www.kernel.org/pub/linux/utils/util-linux/
|
||||
Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.26/%{_name}-%{version}.tar.xz
|
||||
Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.27/%{_name}-%{version}.tar.xz
|
||||
Source1: util-linux-rpmlintrc
|
||||
Source4: raw.init
|
||||
Source5: etc.raw
|
||||
@ -140,7 +140,7 @@ Source8: login.pamd
|
||||
Source9: remote.pamd
|
||||
Source10: su.pamd
|
||||
Source11: su.default
|
||||
Source12: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.26/%{_name}-%{version}.tar.sign
|
||||
Source12: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.27/%{_name}-%{version}.tar.sign
|
||||
Source13: %{_name}.keyring
|
||||
Source14: runuser.pamd
|
||||
# klogconsole, http://opensuse.github.com/kiwi, 7.02.25, git 859dc050
|
||||
@ -515,7 +515,7 @@ sed -i '
|
||||
s/libuuid\.la/-luuid/g
|
||||
s/libblkid\.la/-lblkid/g
|
||||
s/libsmartcols\.la/-lsmartcols/g
|
||||
' libmount/python/Makemodule.am misc-utils/Makemodule.am login-utils/Makemodule.am
|
||||
' libmount/python/Makemodule.am misc-utils/Makemodule.am login-utils/Makemodule.am tests/helpers/Makemodule.am
|
||||
# Ignore dependencies on optional (and not built in second stage) libraries
|
||||
sed -i '
|
||||
s/UL_REQUIRES_BUILD(\[.*\], \[libuuid\])/dnl &/
|
||||
@ -877,18 +877,12 @@ fi
|
||||
%postun -n util-linux-systemd
|
||||
%{service_del_postun fstrim.service fstrim.timer}
|
||||
|
||||
%pre -n uuidd
|
||||
%pre -p /bin/bash -n uuidd
|
||||
/usr/sbin/groupadd -r uuidd 2>/dev/null || :
|
||||
/usr/sbin/useradd -r -g uuidd -c "User for uuidd" \
|
||||
-d /var/run/uuidd uuidd 2>/dev/null || :
|
||||
%{service_add_pre uuidd.socket uuidd.service}
|
||||
# trick: service existed before, but it had no preset before 13.2 and in SLE12. Force %%service_add_post to run preset.
|
||||
if [ $1 -gt 1 ] ; then
|
||||
if ! test -f /usr/lib/systemd/system-preset/50-uuidd.preset ; then
|
||||
echo -n "" >/run/rpm-%{name}-update-uuidd.socket-new-in-upgrade
|
||||
echo -n "" >/run/rpm-%{name}-update-uuidd.service-new-in-upgrade
|
||||
fi
|
||||
fi
|
||||
%systemd_preset_pre
|
||||
|
||||
%post -n uuidd
|
||||
%{service_add_post uuidd.socket uuidd.service}
|
||||
@ -898,6 +892,9 @@ fi
|
||||
|
||||
%postun -n uuidd
|
||||
%{service_del_postun uuidd.socket uuidd.service}
|
||||
|
||||
%posttrans -p /bin/bash -n uuidd
|
||||
%systemd_preset_posttrans
|
||||
%endif
|
||||
|
||||
%if %build_util_linux
|
||||
@ -905,6 +902,11 @@ fi
|
||||
# Common files for all archs
|
||||
%defattr(-,root,root)
|
||||
# util-linux documentation files
|
||||
%doc README.licensing
|
||||
%doc COPYING
|
||||
%doc Documentation/licenses/COPYING.BSD-3
|
||||
%doc Documentation/licenses/COPYING.LGPLv2.1
|
||||
%doc Documentation/licenses/COPYING.UCB
|
||||
%doc Documentation/blkid.txt
|
||||
%doc Documentation/cal.txt
|
||||
%doc Documentation/col.txt
|
||||
@ -998,6 +1000,7 @@ fi
|
||||
%{_bindir}/look
|
||||
%{_bindir}/lsblk
|
||||
%{_bindir}/lscpu
|
||||
%{_bindir}/lsipc
|
||||
%{_bindir}/lslocks
|
||||
%{_bindir}/mcookie
|
||||
%{_bindir}/mesg
|
||||
@ -1100,6 +1103,7 @@ fi
|
||||
%{_mandir}/man1/login.1.gz
|
||||
%{_mandir}/man1/look.1.gz
|
||||
%{_mandir}/man1/lscpu.1.gz
|
||||
%{_mandir}/man1/lsipc.1.gz
|
||||
%{_mandir}/man1/mcookie.1.gz
|
||||
%{_mandir}/man1/mesg.1.gz
|
||||
%{_mandir}/man1/more.1.gz
|
||||
|
@ -1,17 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1
|
||||
|
||||
iQIcBAABAgAGBQJVQgNZAAoJEOS3HV7sOcKE/n8P/RvS8t27ynKMJ/rA42pB9yON
|
||||
miCVGCwNm2JV7eE06iTekuycackuea5d3gnzSoKx7KJNidCSkjQqjo11pS4eaYpN
|
||||
DB9Poi8X+Xn6yFOYm2GMFKSDjnh9cJdZlbrvqiPokhgpsDCHJhbvVZiNrNl8oPaj
|
||||
pbg0u3dA2+/w8axM8MepR5u+17BGQxj4M6dzJX1M0rJYFbnRNpemRPz4OsRKIgHY
|
||||
0GbpK2hvqzX0fGayI4NlkIpYwfI2Yyvd9UMLbwLWKH38tIEvSAEFfCmwQh70YA6R
|
||||
SX63n/KKdfEg+irnwljzW038dXv+MdHFZQtIRryVBTpdVWjMwyq71cFc4Nz2kGyP
|
||||
iFgxxcBsTrOFNjBZWvGlMSJNc7yll6GKGWAJsxcfo31ykuy54GTWAkiDmpNUrUSR
|
||||
Jic6+Bb24HVGTW7qz0guVRnQdRznDir6Wvt8dLCbU/8Um6yf66YCSUwyWACNTAkP
|
||||
QtIExV/gd3aityEqT3d0sSt/yB1GQR8/AUGVd9xQPe81DK54bD+5db3klyOKVs7s
|
||||
Prqje/ARjeHMsDqLPAYQ+LkfXt0VETcB6tWbgklUvqTsqxSnFXPgOF9E7iKw5+0p
|
||||
Z3aHxhxlxtJHtjBm88rBPjsnQStDnXQ1Y6Qcm1OndpKnaeBGjlpO5YBqO2/I5sUa
|
||||
dInyRccybgBxGeG+VuUr
|
||||
=Zgg5
|
||||
-----END PGP SIGNATURE-----
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0e29bda142528a48a0a953c39ff63093651a4809042e1790fbd6aa8663fd9666
|
||||
size 3863868
|
17
util-linux-2.27.tar.sign
Normal file
17
util-linux-2.27.tar.sign
Normal file
@ -0,0 +1,17 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1
|
||||
|
||||
iQIcBAABAgAGBQJV7UZMAAoJEOS3HV7sOcKEWr8QAI0MEaXcmHvqIkPiRj6m0qOj
|
||||
LdbXTWrw8W8UUdCyyNenn7xWrGfp7C4E24ywoNqb7uslvzPEEm1Xpfa2FHA28hJW
|
||||
QrCRAEvpAJt42NlTIoPoxHIoPhU9B5YkcBR5Pc0lpKx+T6s2YSqWlM+lNX+27HRC
|
||||
My9m3uX+ob4Zr/Z9SEhcdVGhdrWWo82EHVu8AC2KpJAZHUhjFZUP3zjGda2PE0GU
|
||||
6Q9Qyi+RSk6km+J1YVYuzENwwliNU2GnMvOn2ZmRe4jgZTaYbkuEagfq998Khbfb
|
||||
XS/dQra4pjSoFxRAX5zZ3aHZWy4joClgBg+1NEqFvI4TFA245MpYSfh9eXXXqzIu
|
||||
G6HQpswBeIuqyE0STagpAmv1/xPNR8o4sw/cPmLIWI2IGpTa+NkIs8BTc3gIDn6G
|
||||
yWxVuWVOIBnbigzkk/UbfC22ZuQNLMxL13F40QDPoL4zfOkxDkMldhTxTrabvs0K
|
||||
jelSgLYXJbjwgJOHAgdvN38iECxBnoSUcJAgq8JysT13FiaYwlpXsK3pJyDRzQ4m
|
||||
Ejnv/xgvJS3Dz0tSAUdSHC+C+joI6ut/zy/M/eQOldtYvutcwyeCwBgUvn6V5/Bw
|
||||
CfNb2oXDVoW7iU2rkuu9H49BId1CiypZDvKK1qWVzd/gFcLyu5a5rKqBSPLCD17t
|
||||
A7EuS7l/eg3/1dxKANDB
|
||||
=JnxE
|
||||
-----END PGP SIGNATURE-----
|
3
util-linux-2.27.tar.xz
Normal file
3
util-linux-2.27.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fcbf04e3ef8377fc8369af7f9afee341c5eef9b02dd5a7ce71532d0957e86dc7
|
||||
size 3968872
|
@ -1,3 +1,46 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 23 14:16:22 CEST 2015 - sbrabec@suse.com
|
||||
|
||||
- Update to version 2.27:
|
||||
* Many changes and improvements, most notably:
|
||||
* lsipc: new command
|
||||
* unshare provides a new option --propagation=
|
||||
* mount(8) supports read-only binds in one (not atomic) step by
|
||||
"bind,ro".
|
||||
* GNU readline support in fdisk and sfdisk.
|
||||
* JSON support in libsmartcols and findmnt, losetup, lsblk,
|
||||
lslocks, sfdisk and lsipc.
|
||||
* script has been massively improved to be more robust and less
|
||||
complex (bsc#888678, bsc#930236).
|
||||
* sulogin supports locked root accounts by --force.
|
||||
* colors support by default. It is possible to change this
|
||||
with --disable-colors-default.
|
||||
* more information in cfdisk
|
||||
* fdisk provides new commands 'F' and 'i'
|
||||
* cal supports the new options --twelve and --months <n>
|
||||
* rtcwake supports a news option --list-modes and --date, no
|
||||
support RTC_ALM_READ and RTC_ALM_SET fallbacks any more.
|
||||
* Many fixes, most notably:
|
||||
* fsck: now supports -r {fd} (bsc#903738)
|
||||
* better handling of multi-path devices
|
||||
(bsc#880468, bsc#924994)
|
||||
* flock: improve timeout handling (bsc#926945)
|
||||
* lsblk: display mountpoint even for top-level device
|
||||
(bsc#943415)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 19 21:18:11 CEST 2015 - sbrabec@suse.com
|
||||
|
||||
- Add licenses.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 4 20:31:55 CEST 2015 - sbrabec@suse.com
|
||||
|
||||
- Add %systemd_preset_pre and %systemd_preset_posttrans that will
|
||||
do one shot presetting of uuidd.service on upgrade.
|
||||
(bnc#900935#c46, FATE#318949).
|
||||
- Remove one shot presetting hacks.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon May 25 16:26:01 UTC 2015 - crrodriguez@opensuse.org
|
||||
|
||||
|
@ -121,7 +121,7 @@ BuildRequires: libmount-devel
|
||||
%endif
|
||||
%endif
|
||||
#END SECOND STAGE DEPENDENCIES
|
||||
Version: 2.26.2
|
||||
Version: 2.27
|
||||
Release: 0
|
||||
# util-linux is a base package and uuidd pre-requiring pwdutils pulls
|
||||
# that into the core build cycle. pwdutils also pulls in the whole
|
||||
@ -130,7 +130,7 @@ Release: 0
|
||||
# these tools as well
|
||||
#!BuildIgnore: pwdutils
|
||||
Url: https://www.kernel.org/pub/linux/utils/util-linux/
|
||||
Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.26/%{_name}-%{version}.tar.xz
|
||||
Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.27/%{_name}-%{version}.tar.xz
|
||||
Source1: util-linux-rpmlintrc
|
||||
Source4: raw.init
|
||||
Source5: etc.raw
|
||||
@ -140,7 +140,7 @@ Source8: login.pamd
|
||||
Source9: remote.pamd
|
||||
Source10: su.pamd
|
||||
Source11: su.default
|
||||
Source12: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.26/%{_name}-%{version}.tar.sign
|
||||
Source12: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.27/%{_name}-%{version}.tar.sign
|
||||
Source13: %{_name}.keyring
|
||||
Source14: runuser.pamd
|
||||
# klogconsole, http://opensuse.github.com/kiwi, 7.02.25, git 859dc050
|
||||
@ -515,7 +515,7 @@ sed -i '
|
||||
s/libuuid\.la/-luuid/g
|
||||
s/libblkid\.la/-lblkid/g
|
||||
s/libsmartcols\.la/-lsmartcols/g
|
||||
' libmount/python/Makemodule.am misc-utils/Makemodule.am login-utils/Makemodule.am
|
||||
' libmount/python/Makemodule.am misc-utils/Makemodule.am login-utils/Makemodule.am tests/helpers/Makemodule.am
|
||||
# Ignore dependencies on optional (and not built in second stage) libraries
|
||||
sed -i '
|
||||
s/UL_REQUIRES_BUILD(\[.*\], \[libuuid\])/dnl &/
|
||||
@ -877,18 +877,12 @@ fi
|
||||
%postun -n util-linux-systemd
|
||||
%{service_del_postun fstrim.service fstrim.timer}
|
||||
|
||||
%pre -n uuidd
|
||||
%pre -p /bin/bash -n uuidd
|
||||
/usr/sbin/groupadd -r uuidd 2>/dev/null || :
|
||||
/usr/sbin/useradd -r -g uuidd -c "User for uuidd" \
|
||||
-d /var/run/uuidd uuidd 2>/dev/null || :
|
||||
%{service_add_pre uuidd.socket uuidd.service}
|
||||
# trick: service existed before, but it had no preset before 13.2 and in SLE12. Force %%service_add_post to run preset.
|
||||
if [ $1 -gt 1 ] ; then
|
||||
if ! test -f /usr/lib/systemd/system-preset/50-uuidd.preset ; then
|
||||
echo -n "" >/run/rpm-%{name}-update-uuidd.socket-new-in-upgrade
|
||||
echo -n "" >/run/rpm-%{name}-update-uuidd.service-new-in-upgrade
|
||||
fi
|
||||
fi
|
||||
%systemd_preset_pre
|
||||
|
||||
%post -n uuidd
|
||||
%{service_add_post uuidd.socket uuidd.service}
|
||||
@ -898,6 +892,9 @@ fi
|
||||
|
||||
%postun -n uuidd
|
||||
%{service_del_postun uuidd.socket uuidd.service}
|
||||
|
||||
%posttrans -p /bin/bash -n uuidd
|
||||
%systemd_preset_posttrans
|
||||
%endif
|
||||
|
||||
%if %build_util_linux
|
||||
@ -905,6 +902,11 @@ fi
|
||||
# Common files for all archs
|
||||
%defattr(-,root,root)
|
||||
# util-linux documentation files
|
||||
%doc README.licensing
|
||||
%doc COPYING
|
||||
%doc Documentation/licenses/COPYING.BSD-3
|
||||
%doc Documentation/licenses/COPYING.LGPLv2.1
|
||||
%doc Documentation/licenses/COPYING.UCB
|
||||
%doc Documentation/blkid.txt
|
||||
%doc Documentation/cal.txt
|
||||
%doc Documentation/col.txt
|
||||
@ -998,6 +1000,7 @@ fi
|
||||
%{_bindir}/look
|
||||
%{_bindir}/lsblk
|
||||
%{_bindir}/lscpu
|
||||
%{_bindir}/lsipc
|
||||
%{_bindir}/lslocks
|
||||
%{_bindir}/mcookie
|
||||
%{_bindir}/mesg
|
||||
@ -1100,6 +1103,7 @@ fi
|
||||
%{_mandir}/man1/login.1.gz
|
||||
%{_mandir}/man1/look.1.gz
|
||||
%{_mandir}/man1/lscpu.1.gz
|
||||
%{_mandir}/man1/lsipc.1.gz
|
||||
%{_mandir}/man1/mcookie.1.gz
|
||||
%{_mandir}/man1/mesg.1.gz
|
||||
%{_mandir}/man1/more.1.gz
|
||||
|
@ -1,3 +1,46 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 23 14:16:22 CEST 2015 - sbrabec@suse.com
|
||||
|
||||
- Update to version 2.27:
|
||||
* Many changes and improvements, most notably:
|
||||
* lsipc: new command
|
||||
* unshare provides a new option --propagation=
|
||||
* mount(8) supports read-only binds in one (not atomic) step by
|
||||
"bind,ro".
|
||||
* GNU readline support in fdisk and sfdisk.
|
||||
* JSON support in libsmartcols and findmnt, losetup, lsblk,
|
||||
lslocks, sfdisk and lsipc.
|
||||
* script has been massively improved to be more robust and less
|
||||
complex (bsc#888678, bsc#930236).
|
||||
* sulogin supports locked root accounts by --force.
|
||||
* colors support by default. It is possible to change this
|
||||
with --disable-colors-default.
|
||||
* more information in cfdisk
|
||||
* fdisk provides new commands 'F' and 'i'
|
||||
* cal supports the new options --twelve and --months <n>
|
||||
* rtcwake supports a news option --list-modes and --date, no
|
||||
support RTC_ALM_READ and RTC_ALM_SET fallbacks any more.
|
||||
* Many fixes, most notably:
|
||||
* fsck: now supports -r {fd} (bsc#903738)
|
||||
* better handling of multi-path devices
|
||||
(bsc#880468, bsc#924994)
|
||||
* flock: improve timeout handling (bsc#926945)
|
||||
* lsblk: display mountpoint even for top-level device
|
||||
(bsc#943415)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 19 21:18:11 CEST 2015 - sbrabec@suse.com
|
||||
|
||||
- Add licenses.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 4 20:31:55 CEST 2015 - sbrabec@suse.com
|
||||
|
||||
- Add %systemd_preset_pre and %systemd_preset_posttrans that will
|
||||
do one shot presetting of uuidd.service on upgrade.
|
||||
(bnc#900935#c46, FATE#318949).
|
||||
- Remove one shot presetting hacks.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon May 25 16:26:01 UTC 2015 - crrodriguez@opensuse.org
|
||||
|
||||
|
@ -121,7 +121,7 @@ BuildRequires: libmount-devel
|
||||
%endif
|
||||
%endif
|
||||
#END SECOND STAGE DEPENDENCIES
|
||||
Version: 2.26.2
|
||||
Version: 2.27
|
||||
Release: 0
|
||||
# util-linux is a base package and uuidd pre-requiring pwdutils pulls
|
||||
# that into the core build cycle. pwdutils also pulls in the whole
|
||||
@ -130,7 +130,7 @@ Release: 0
|
||||
# these tools as well
|
||||
#!BuildIgnore: pwdutils
|
||||
Url: https://www.kernel.org/pub/linux/utils/util-linux/
|
||||
Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.26/%{_name}-%{version}.tar.xz
|
||||
Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.27/%{_name}-%{version}.tar.xz
|
||||
Source1: util-linux-rpmlintrc
|
||||
Source4: raw.init
|
||||
Source5: etc.raw
|
||||
@ -140,7 +140,7 @@ Source8: login.pamd
|
||||
Source9: remote.pamd
|
||||
Source10: su.pamd
|
||||
Source11: su.default
|
||||
Source12: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.26/%{_name}-%{version}.tar.sign
|
||||
Source12: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.27/%{_name}-%{version}.tar.sign
|
||||
Source13: %{_name}.keyring
|
||||
Source14: runuser.pamd
|
||||
# klogconsole, http://opensuse.github.com/kiwi, 7.02.25, git 859dc050
|
||||
@ -515,7 +515,7 @@ sed -i '
|
||||
s/libuuid\.la/-luuid/g
|
||||
s/libblkid\.la/-lblkid/g
|
||||
s/libsmartcols\.la/-lsmartcols/g
|
||||
' libmount/python/Makemodule.am misc-utils/Makemodule.am login-utils/Makemodule.am
|
||||
' libmount/python/Makemodule.am misc-utils/Makemodule.am login-utils/Makemodule.am tests/helpers/Makemodule.am
|
||||
# Ignore dependencies on optional (and not built in second stage) libraries
|
||||
sed -i '
|
||||
s/UL_REQUIRES_BUILD(\[.*\], \[libuuid\])/dnl &/
|
||||
@ -877,18 +877,12 @@ fi
|
||||
%postun -n util-linux-systemd
|
||||
%{service_del_postun fstrim.service fstrim.timer}
|
||||
|
||||
%pre -n uuidd
|
||||
%pre -p /bin/bash -n uuidd
|
||||
/usr/sbin/groupadd -r uuidd 2>/dev/null || :
|
||||
/usr/sbin/useradd -r -g uuidd -c "User for uuidd" \
|
||||
-d /var/run/uuidd uuidd 2>/dev/null || :
|
||||
%{service_add_pre uuidd.socket uuidd.service}
|
||||
# trick: service existed before, but it had no preset before 13.2 and in SLE12. Force %%service_add_post to run preset.
|
||||
if [ $1 -gt 1 ] ; then
|
||||
if ! test -f /usr/lib/systemd/system-preset/50-uuidd.preset ; then
|
||||
echo -n "" >/run/rpm-%{name}-update-uuidd.socket-new-in-upgrade
|
||||
echo -n "" >/run/rpm-%{name}-update-uuidd.service-new-in-upgrade
|
||||
fi
|
||||
fi
|
||||
%systemd_preset_pre
|
||||
|
||||
%post -n uuidd
|
||||
%{service_add_post uuidd.socket uuidd.service}
|
||||
@ -898,6 +892,9 @@ fi
|
||||
|
||||
%postun -n uuidd
|
||||
%{service_del_postun uuidd.socket uuidd.service}
|
||||
|
||||
%posttrans -p /bin/bash -n uuidd
|
||||
%systemd_preset_posttrans
|
||||
%endif
|
||||
|
||||
%if %build_util_linux
|
||||
@ -905,6 +902,11 @@ fi
|
||||
# Common files for all archs
|
||||
%defattr(-,root,root)
|
||||
# util-linux documentation files
|
||||
%doc README.licensing
|
||||
%doc COPYING
|
||||
%doc Documentation/licenses/COPYING.BSD-3
|
||||
%doc Documentation/licenses/COPYING.LGPLv2.1
|
||||
%doc Documentation/licenses/COPYING.UCB
|
||||
%doc Documentation/blkid.txt
|
||||
%doc Documentation/cal.txt
|
||||
%doc Documentation/col.txt
|
||||
@ -998,6 +1000,7 @@ fi
|
||||
%{_bindir}/look
|
||||
%{_bindir}/lsblk
|
||||
%{_bindir}/lscpu
|
||||
%{_bindir}/lsipc
|
||||
%{_bindir}/lslocks
|
||||
%{_bindir}/mcookie
|
||||
%{_bindir}/mesg
|
||||
@ -1100,6 +1103,7 @@ fi
|
||||
%{_mandir}/man1/login.1.gz
|
||||
%{_mandir}/man1/look.1.gz
|
||||
%{_mandir}/man1/lscpu.1.gz
|
||||
%{_mandir}/man1/lsipc.1.gz
|
||||
%{_mandir}/man1/mcookie.1.gz
|
||||
%{_mandir}/man1/mesg.1.gz
|
||||
%{_mandir}/man1/more.1.gz
|
||||
|
Loading…
Reference in New Issue
Block a user