clean up spec file: remove comment out macros and sub packages

[external/systemd.git] / packaging / systemd.spec

diff --git a/packaging/systemd.spec b/packaging/systemd.spec
index 8472293..ed02506 100644 (file)
--- a/packaging/systemd.spec
+++ b/packaging/systemd.spec
@@ -22,7 +22,9 @@ Patch9:     main-allow-system-wide-limits-for-services.patch
 Patch10:    enable-core-dumps-globally.patch
 Patch11:    SMACK-Add-configuration-options.-v3.patch
 Patch12:    reboot_syscall_param.patch
-Patch13:       default_oom_score.patch
+Patch13:    default_oom_score.patch
+Patch14:    fix-syscall-NR_fanotify_mark-on-arm.patch
+Patch15:    reboot-delay.patch
 
 BuildRequires:  pkgconfig(dbus-1) >= 1.4.0
 BuildRequires:  pkgconfig(dbus-glib-1)
@@ -49,18 +51,6 @@ of the system state, maintains mount and automount points and
 implements an elaborate transactional dependency-based service
 control logic. It can work as a drop-in replacement for sysvinit.
 
-# tools package dislabled because of pycairo package dependency
-# %package tools
-# Summary:    Analyze systemd startup timing
-# Group:      Development/Tools
-# Requires:   pycairo
-# Requires:   python-xml
-# Requires:   %{name} = %{version}-%{release}
-
-# %description tools
-# This package installs the systemd-analyze tool, which allows one to
-# inspect and graph service startup timing in table or graph format.
-
 %package devel
 Summary:    Development tools for systemd
 Group:      Development/Libraries
@@ -133,36 +123,6 @@ Requires:  %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 This package includes the man pages for systemd.
 
 
-# %package sysv-docs
-# Summary:   System and session manager man pages - SysV links
-# Group:     Development/Libraries
-# Requires:  %{name} = %{version}-%{release}
-
-# %description sysv-docs
-# This package provides the manual pages needed for systemd
-# to replace sysvinit.
-
-# %package sysv
-# Summary:   System and session manager - SysV links
-# Group:     System/Startup Services
-# Requires:  %{name} = %{version}-%{release}
-# Obsoletes: sysvinit < 3.0
-# Provides:  sysvinit = 3.0
-
-
- #%description sysv
-# Systemd is a replacement for sysvinit.  It is dependency-based and
-# able to read the LSB init script headers in addition to parsing rcN.d
-# links as hints.
-
-# It also provides process supervision using cgroups and the ability to
-# not only depend on other init script being started, but also
-# availability of a given mount point or dbus service.
-
-# This package provides the links needed for systemd
-# to replace sysvinit.
-
-
 %prep
 %setup -q -n %{name}-%{version}
 %patch1 -p1
@@ -178,6 +138,8 @@ This package includes the man pages for systemd.
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
+%patch15 -p1
 
 %build
 cp %{SOURCE1001} .