drop group fields
This commit is contained in:
Lennart Poettering
parent
114c78593e
commit
add3e7178e
52
systemd.spec
52
systemd.spec
|
|
@ -6,7 +6,6 @@ Version: 187
|
|||
Release: 4%{?gitcommit:.git%{gitcommit}}%{?dist}
|
||||
# For a breakdown of the licensing, see README
|
||||
License: LGPLv2+ and MIT and GPLv2+
|
||||
Group: System Environment/Base
|
||||
Summary: A System and Service Manager
|
||||
BuildRequires: libcap-devel
|
||||
BuildRequires: tcp_wrappers-devel
|
||||
|
|
@ -38,7 +37,8 @@ BuildRequires: libtool
|
|||
Requires(post): coreutils
|
||||
Requires(post): gawk
|
||||
Requires(pre): coreutils
|
||||
Requires(pre): /usr/bin/getent /usr/sbin/groupadd
|
||||
Requires(pre): /usr/bin/getent
|
||||
Requires(pre): /usr/sbin/groupadd
|
||||
Requires: dbus
|
||||
Requires: hwdata
|
||||
Requires: filesystem >= 3
|
||||
|
|
@ -92,7 +92,6 @@ elaborate transactional dependency-based service control logic. It can
|
|||
work as a drop-in replacement for sysvinit.
|
||||
|
||||
%package libs
|
||||
Group: System Environment/Base
|
||||
Summary: systemd libraries
|
||||
License: LGPLv2+ and MIT
|
||||
Obsoletes: libudev < 183
|
||||
|
|
@ -103,7 +102,6 @@ Conflicts: systemd < 185-4
|
|||
Libraries for systemd and udev. systemd PAM module.
|
||||
|
||||
%package devel
|
||||
Group: System Environment/Base
|
||||
Summary: Development headers for systemd
|
||||
License: LGPLv2+ and MIT
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
|
@ -114,7 +112,6 @@ Obsoletes: libudev-devel < 183
|
|||
Development headers and auxiliary files for developing applications for systemd.
|
||||
|
||||
%package sysv
|
||||
Group: System Environment/Base
|
||||
Summary: SysV tools for systemd
|
||||
License: LGPLv2+
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
|
@ -123,7 +120,6 @@ Requires: %{name} = %{version}-%{release}
|
|||
SysV compatibility tools for systemd
|
||||
|
||||
%package analyze
|
||||
Group: System Environment/Base
|
||||
Summary: Tool for processing systemd profiling information
|
||||
License: LGPLv2+
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
|
@ -140,7 +136,6 @@ at boot.
|
|||
|
||||
%package -n libgudev1
|
||||
Summary: Libraries for adding libudev support to applications that use glib
|
||||
Group: Development/Libraries
|
||||
Conflicts: filesystem < 3
|
||||
License: LGPLv2+
|
||||
|
||||
|
|
@ -150,7 +145,6 @@ functionality from applications that use glib.
|
|||
|
||||
%package -n libgudev1-devel
|
||||
Summary: Header files for adding libudev support to applications that use glib
|
||||
Group: Development/Libraries
|
||||
Requires: libgudev1 = %{version}-%{release}
|
||||
License: LGPLv2+
|
||||
|
||||
|
|
@ -302,29 +296,29 @@ fi
|
|||
# Convert old /etc/sysconfig/desktop settings
|
||||
preferred=
|
||||
if [ -f /etc/sysconfig/desktop ]; then
|
||||
. /etc/sysconfig/desktop
|
||||
if [ "$DISPLAYMANAGER" = GNOME ]; then
|
||||
preferred=gdm
|
||||
elif [ "$DISPLAYMANAGER" = KDE ]; then
|
||||
preferred=kdm
|
||||
elif [ "$DISPLAYMANAGER" = WDM ]; then
|
||||
preferred=wdm
|
||||
elif [ "$DISPLAYMANAGER" = XDM ]; then
|
||||
preferred=xdm
|
||||
. /etc/sysconfig/desktop
|
||||
if [ "$DISPLAYMANAGER" = GNOME ]; then
|
||||
preferred=gdm
|
||||
elif [ "$DISPLAYMANAGER" = KDE ]; then
|
||||
preferred=kdm
|
||||
elif [ "$DISPLAYMANAGER" = WDM ]; then
|
||||
preferred=wdm
|
||||
elif [ "$DISPLAYMANAGER" = XDM ]; then
|
||||
preferred=xdm
|
||||
elif [ -n "$DISPLAYMANAGER" ]; then
|
||||
preferred=${DISPLAYMANAGER##*/}
|
||||
fi
|
||||
preferred=${DISPLAYMANAGER##*/}
|
||||
fi
|
||||
fi
|
||||
if [ -z "$preferred" ]; then
|
||||
if [ -x /usr/sbin/gdm ]; then
|
||||
preferred=gdm
|
||||
elif [ -x /usr/bin/kdm ]; then
|
||||
preferred=kdm
|
||||
fi
|
||||
if [ -x /usr/sbin/gdm ]; then
|
||||
preferred=gdm
|
||||
elif [ -x /usr/bin/kdm ]; then
|
||||
preferred=kdm
|
||||
fi
|
||||
fi
|
||||
if [ -n "$preferred" -a -r "/usr/lib/systemd/system/$preferred.service" ]; then
|
||||
# This is supposed to fail when the symlink already exists
|
||||
/usr/bin/ln -s "/usr/lib/systemd/system/$preferred.service" /etc/systemd/system/display-manager.service >/dev/null 2>&1 || :
|
||||
/usr/bin/ln -s "/usr/lib/systemd/system/$preferred.service" /etc/systemd/system/display-manager.service >/dev/null 2>&1 || :
|
||||
fi
|
||||
|
||||
%postun
|
||||
|
|
@ -355,11 +349,11 @@ fi
|
|||
systemd-readahead-replay.service \
|
||||
systemd-readahead-collect.service
|
||||
|
||||
%post libs -p /sbin/ldconfig
|
||||
%postun libs -p /sbin/ldconfig
|
||||
%post libs -p /usr/sbin/ldconfig
|
||||
%postun libs -p /usr/sbin/ldconfig
|
||||
|
||||
%post -n libgudev1 -p /sbin/ldconfig
|
||||
%postun -n libgudev1 -p /sbin/ldconfig
|
||||
%post -n libgudev1 -p /usr/sbin/ldconfig
|
||||
%postun -n libgudev1 -p /usr/sbin/ldconfig
|
||||
|
||||
%files
|
||||
%doc %{_docdir}/systemd
|
||||
|
|
|
|||
Loading…
Reference in New Issue