From c2099fa71afc599f78d5242304bd89089903136bf8e8b5404ac109af9499955a Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 25 Sep 2017 09:20:17 +0000 Subject: [PATCH] Accepting request 528095 from home:jengelh:branches:Base:System - Update RPM categories and summaries. Do not ignore errors from useradd. OBS-URL: https://build.opensuse.org/request/show/528095 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=350 --- python-libmount.changes | 11 +++++++++++ python-libmount.spec | 35 ++++++++++++++++++++--------------- util-linux-systemd.changes | 6 ++++++ util-linux-systemd.spec | 31 ++++++++++++++++--------------- util-linux.changes | 6 ++++++ util-linux.spec | 31 ++++++++++++++++--------------- 6 files changed, 75 insertions(+), 45 deletions(-) diff --git a/python-libmount.changes b/python-libmount.changes index ebafa17..2790010 100644 --- a/python-libmount.changes +++ b/python-libmount.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Sep 21 14:41:01 UTC 2017 - jengelh@inai.de + +- Update RPM categories and summaries. + Do not ignore errors from useradd. + +------------------------------------------------------------------- +Fri Sep 15 07:17:45 UTC 2017 - werner@suse.de + +- Ensure libreadline usage as well as _GNU_SOURCE + ------------------------------------------------------------------- Tue Sep 12 12:35:34 CEST 2017 - sbrabec@suse.com diff --git a/python-libmount.spec b/python-libmount.spec index 5070e3f..89b3e7d 100644 --- a/python-libmount.spec +++ b/python-libmount.spec @@ -42,7 +42,7 @@ Name: python-libmount %define summary_pl Python bindings for the libmount library %define group_ul System/Base %define group_uls System/Base -%define group_pl System/Filesystems +%define group_pl Development/Languages/Python %if "%{name}" == "python-libmount" %define build_util_linux 0 %define build_util_linux_systemd 0 @@ -241,7 +241,7 @@ mount program, the fdisk configuration tool, and more. %package -n libblkid1 Summary: Filesystem detection library -Group: System/Filesystems +Group: System/Libraries %description -n libblkid1 Library for filesystem detection. @@ -266,13 +266,13 @@ detection. %package -n libuuid1 Summary: Library to generate UUIDs -Group: System/Filesystems +Group: System/Libraries %description -n libuuid1 A library to generate universally unique IDs (UUIDs). %package -n libuuid-devel -Summary: Development files for libuuid1 +Summary: Development files for libuuid Group: Development/Libraries/C and C++ Requires: libuuid1 = %{version} @@ -281,7 +281,7 @@ Files to develop applications using the library to generate universally unique IDs (UUIDs). %package -n libuuid-devel-static -Summary: Development files for libuuid1 +Summary: Development files for libuuid Group: Development/Libraries/C and C++ Requires: libuuid-devel = %{version} @@ -291,19 +291,19 @@ unique IDs (UUIDs). %package -n libmount1 Summary: Device mount library -Group: System/Filesystems +Group: System/Libraries %description -n libmount1 Library designed to be used in low-level utils like mount(8) and /usr/sbin/mount. helpers. %package -n libmount-devel -Summary: Development files for libmount1 +Summary: Development files for libmount Group: Development/Libraries/C and C++ Requires: libmount1 = %{version} %package -n libmount-devel-static -Summary: Development files for libmount1 +Summary: Development files for libmount Group: Development/Libraries/C and C++ Requires: libmount-devel = %{version} @@ -321,7 +321,7 @@ Group: System/Libraries Library to sort human readable column-based text output. %package -n libsmartcols-devel -Summary: Development files for libsmartcols1 +Summary: Development files for libsmartcols Group: Development/Libraries/C and C++ Requires: libsmartcols1 = %{version} @@ -329,7 +329,7 @@ Requires: libsmartcols1 = %{version} Files to develop applications using the libsmartcols library. %package -n libsmartcols-devel-static -Summary: Development files for libsmartcols1 +Summary: Development files for libsmartcols Group: Development/Libraries/C and C++ Requires: libsmartcols-devel = %{version} @@ -338,7 +338,7 @@ Files to develop applications using the libsmartcols library. %package -n libfdisk1 Summary: Filesystem detection library -Group: System/Filesystems +Group: System/Libraries %description -n libfdisk1 Library for filesystem detection. @@ -410,7 +410,7 @@ Group: %group_pl %else %description %endif -This package contains the python bindings for util-linux libmount +This package contains the Python bindings for util-linux libmount library. %endif @@ -543,6 +543,8 @@ fi export SUID_CFLAGS="-fpie" export SUID_LDFLAGS="-pie" export LDFLAGS="-Wl,-z,relro,-z,now" +export CFLAGS="%{optflags} -D_GNU_SOURCE" +export CXXFLAGS="%{optflags} -D_GNU_SOURCE" # override default localstatedir to /run # only used for volatile data # @@ -554,8 +556,10 @@ AUTOPOINT=true autoreconf -vfi --localstatedir=/run \ --docdir=%{_docdir}/%{_name} \ --with-audit \ + --with-btrfs \ --with-gnu-ld \ --with-ncursesw \ + --with-readline \ --with-selinux \ $uhead \ --with-bashcompletiondir=%{_datadir}/bash-completion/completions \ @@ -859,9 +863,10 @@ done %pre -n uuidd %else %pre -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 || : +getent group uuidd >/dev/null || /usr/sbin/groupadd -r uuidd +getent passwd uuidd >/dev/null || \ + /usr/sbin/useradd -r -g uuidd -c "User for uuidd" \ + -d /var/run/uuidd uuidd %endif %{service_add_pre uuidd.socket uuidd.service} diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index 124140e..2790010 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 21 14:41:01 UTC 2017 - jengelh@inai.de + +- Update RPM categories and summaries. + Do not ignore errors from useradd. + ------------------------------------------------------------------- Fri Sep 15 07:17:45 UTC 2017 - werner@suse.de diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index aa28d15..1512344 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -42,7 +42,7 @@ Name: util-linux-systemd %define summary_pl Python bindings for the libmount library %define group_ul System/Base %define group_uls System/Base -%define group_pl System/Filesystems +%define group_pl Development/Languages/Python %if "%{name}" == "python-libmount" %define build_util_linux 0 %define build_util_linux_systemd 0 @@ -241,7 +241,7 @@ mount program, the fdisk configuration tool, and more. %package -n libblkid1 Summary: Filesystem detection library -Group: System/Filesystems +Group: System/Libraries %description -n libblkid1 Library for filesystem detection. @@ -266,13 +266,13 @@ detection. %package -n libuuid1 Summary: Library to generate UUIDs -Group: System/Filesystems +Group: System/Libraries %description -n libuuid1 A library to generate universally unique IDs (UUIDs). %package -n libuuid-devel -Summary: Development files for libuuid1 +Summary: Development files for libuuid Group: Development/Libraries/C and C++ Requires: libuuid1 = %{version} @@ -281,7 +281,7 @@ Files to develop applications using the library to generate universally unique IDs (UUIDs). %package -n libuuid-devel-static -Summary: Development files for libuuid1 +Summary: Development files for libuuid Group: Development/Libraries/C and C++ Requires: libuuid-devel = %{version} @@ -291,19 +291,19 @@ unique IDs (UUIDs). %package -n libmount1 Summary: Device mount library -Group: System/Filesystems +Group: System/Libraries %description -n libmount1 Library designed to be used in low-level utils like mount(8) and /usr/sbin/mount. helpers. %package -n libmount-devel -Summary: Development files for libmount1 +Summary: Development files for libmount Group: Development/Libraries/C and C++ Requires: libmount1 = %{version} %package -n libmount-devel-static -Summary: Development files for libmount1 +Summary: Development files for libmount Group: Development/Libraries/C and C++ Requires: libmount-devel = %{version} @@ -321,7 +321,7 @@ Group: System/Libraries Library to sort human readable column-based text output. %package -n libsmartcols-devel -Summary: Development files for libsmartcols1 +Summary: Development files for libsmartcols Group: Development/Libraries/C and C++ Requires: libsmartcols1 = %{version} @@ -329,7 +329,7 @@ Requires: libsmartcols1 = %{version} Files to develop applications using the libsmartcols library. %package -n libsmartcols-devel-static -Summary: Development files for libsmartcols1 +Summary: Development files for libsmartcols Group: Development/Libraries/C and C++ Requires: libsmartcols-devel = %{version} @@ -338,7 +338,7 @@ Files to develop applications using the libsmartcols library. %package -n libfdisk1 Summary: Filesystem detection library -Group: System/Filesystems +Group: System/Libraries %description -n libfdisk1 Library for filesystem detection. @@ -409,7 +409,7 @@ Group: %group_pl %else %description %endif -This package contains the python bindings for util-linux libmount +This package contains the Python bindings for util-linux libmount library. %endif @@ -862,9 +862,10 @@ done %pre -n uuidd %else %pre -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 || : +getent group uuidd >/dev/null || /usr/sbin/groupadd -r uuidd +getent passwd uuidd >/dev/null || \ + /usr/sbin/useradd -r -g uuidd -c "User for uuidd" \ + -d /var/run/uuidd uuidd %endif %{service_add_pre uuidd.socket uuidd.service} diff --git a/util-linux.changes b/util-linux.changes index 124140e..2790010 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 21 14:41:01 UTC 2017 - jengelh@inai.de + +- Update RPM categories and summaries. + Do not ignore errors from useradd. + ------------------------------------------------------------------- Fri Sep 15 07:17:45 UTC 2017 - werner@suse.de diff --git a/util-linux.spec b/util-linux.spec index 03ab85d..0070347 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -42,7 +42,7 @@ Name: util-linux %define summary_pl Python bindings for the libmount library %define group_ul System/Base %define group_uls System/Base -%define group_pl System/Filesystems +%define group_pl Development/Languages/Python %if "%{name}" == "python-libmount" %define build_util_linux 0 %define build_util_linux_systemd 0 @@ -241,7 +241,7 @@ mount program, the fdisk configuration tool, and more. %package -n libblkid1 Summary: Filesystem detection library -Group: System/Filesystems +Group: System/Libraries %description -n libblkid1 Library for filesystem detection. @@ -266,13 +266,13 @@ detection. %package -n libuuid1 Summary: Library to generate UUIDs -Group: System/Filesystems +Group: System/Libraries %description -n libuuid1 A library to generate universally unique IDs (UUIDs). %package -n libuuid-devel -Summary: Development files for libuuid1 +Summary: Development files for libuuid Group: Development/Libraries/C and C++ Requires: libuuid1 = %{version} @@ -281,7 +281,7 @@ Files to develop applications using the library to generate universally unique IDs (UUIDs). %package -n libuuid-devel-static -Summary: Development files for libuuid1 +Summary: Development files for libuuid Group: Development/Libraries/C and C++ Requires: libuuid-devel = %{version} @@ -291,19 +291,19 @@ unique IDs (UUIDs). %package -n libmount1 Summary: Device mount library -Group: System/Filesystems +Group: System/Libraries %description -n libmount1 Library designed to be used in low-level utils like mount(8) and /usr/sbin/mount. helpers. %package -n libmount-devel -Summary: Development files for libmount1 +Summary: Development files for libmount Group: Development/Libraries/C and C++ Requires: libmount1 = %{version} %package -n libmount-devel-static -Summary: Development files for libmount1 +Summary: Development files for libmount Group: Development/Libraries/C and C++ Requires: libmount-devel = %{version} @@ -321,7 +321,7 @@ Group: System/Libraries Library to sort human readable column-based text output. %package -n libsmartcols-devel -Summary: Development files for libsmartcols1 +Summary: Development files for libsmartcols Group: Development/Libraries/C and C++ Requires: libsmartcols1 = %{version} @@ -329,7 +329,7 @@ Requires: libsmartcols1 = %{version} Files to develop applications using the libsmartcols library. %package -n libsmartcols-devel-static -Summary: Development files for libsmartcols1 +Summary: Development files for libsmartcols Group: Development/Libraries/C and C++ Requires: libsmartcols-devel = %{version} @@ -338,7 +338,7 @@ Files to develop applications using the libsmartcols library. %package -n libfdisk1 Summary: Filesystem detection library -Group: System/Filesystems +Group: System/Libraries %description -n libfdisk1 Library for filesystem detection. @@ -409,7 +409,7 @@ Group: %group_pl %else %description %endif -This package contains the python bindings for util-linux libmount +This package contains the Python bindings for util-linux libmount library. %endif @@ -862,9 +862,10 @@ done %pre -n uuidd %else %pre -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 || : +getent group uuidd >/dev/null || /usr/sbin/groupadd -r uuidd +getent passwd uuidd >/dev/null || \ + /usr/sbin/useradd -r -g uuidd -c "User for uuidd" \ + -d /var/run/uuidd uuidd %endif %{service_add_pre uuidd.socket uuidd.service}