]> git.pld-linux.org Git - packages/systemd.git/blobdiff - systemd.spec
projects / packages / systemd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- Obsoletes elogind
[packages/systemd.git] / systemd.spec
diff --git a/systemd.spec b/systemd.spec
index c3bab9640553a8fae43e89ef28c7c89d4d63fa40..346ae2b10ee76da6a44268cd49e672119e0e3d8e 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -26,7 +26,7 @@ Summary(pl.UTF-8):    systemd - zarządca systemu i usług dla Linuksa
 Name:          systemd
 # Verify ChangeLog and NEWS when updating (since there are incompatible/breaking changes very often)
 Version:       232
-Release:       5
+Release:       7
 Epoch:         1
 License:       GPL v2+ (udev), LGPL v2.1+ (the rest)
 Group:         Base
@@ -80,7 +80,11 @@ BuildRequires:       acl-devel
 BuildRequires: autoconf >= 2.64
 BuildRequires: automake >= 1:1.11
 BuildRequires: binutils >= 3:2.22.52.0.1-2
+BuildRequires: bzip2-devel
+# ln --relative
+BuildRequires: coreutils >= 8.16
 %{?with_cryptsetup:BuildRequires:      cryptsetup-devel >= 1.6.0}
+BuildRequires: curl-devel >= 7.32.0
 BuildRequires: dbus-devel >= 1.4.0
 BuildRequires: docbook-dtd45-xml
 BuildRequires: docbook-style-xsl
@@ -91,32 +95,35 @@ BuildRequires:      glibc-misc
 BuildRequires: gnutls-devel >= 3.1.4
 BuildRequires: gperf
 BuildRequires: intltool >= 0.40.0
+# pkgconfig(libiptc)
+BuildRequires: iptables-devel
 BuildRequires: kmod-devel >= 15
 BuildRequires: libapparmor-devel
 BuildRequires: libblkid-devel >= 2.24
 BuildRequires: libcap-devel
 BuildRequires: libgcrypt-devel >= 1.4.5
-#BuildRequires:        libidn-devel
-#BuildRequires:        liblzma-devel
+BuildRequires: libgpg-error-devel >= 1.12
+BuildRequires: libidn-devel
 %{?with_microhttpd:BuildRequires:      libmicrohttpd-devel >= 0.9.33}
 BuildRequires: libmount-devel >= 2.28.2-2
-BuildRequires: libseccomp-devel >= 1.0.0
+BuildRequires: libseccomp-devel >= 2.3.1
 %{?with_selinux:BuildRequires: libselinux-devel >= 2.6}
 BuildRequires: libtool >= 2:2.2
 BuildRequires: libxslt-progs
-BuildRequires: lz4-devel >= r119
+BuildRequires: lz4-devel >= r125
 BuildRequires: m4
 %{?with_pam:BuildRequires:     pam-devel >= 1.1.2}
 BuildRequires: pkgconfig >= 0.9.0
+BuildRequires: python >= 2
+BuildRequires: python-lxml
 %{?with_qrencode:BuildRequires:        qrencode-devel}
 BuildRequires: rpmbuild(macros) >= 1.628
 BuildRequires: sed >= 4.0
 %{?with_tests:BuildRequires:   systemd}
 BuildRequires: usbutils >= 0.82
+BuildRequires: xorg-lib-libxkbcommon-devel >= 0.5.0
 BuildRequires: xz-devel
 BuildRequires: zlib-devel
-Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
-Requires:      %{name}-units = %{epoch}:%{version}-%{release}
 Requires(post,postun): %{name}-units = %{epoch}:%{version}-%{release}
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel
@@ -125,14 +132,19 @@ Requires(pre):    /bin/id
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
+Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
+Requires:      %{name}-units = %{epoch}:%{version}-%{release}
 Requires:      /etc/os-release
 Requires:      SysVinit-tools
 Requires:      agetty
 %{?with_cryptsetup:Requires:   cryptsetup >= 1.6.0}
+Requires:      curl-libs >= 7.32.0
 Requires:      dbus >= 1.4.16-6
 Requires:      filesystem >= 4.0-39
 Requires:      glibc >= 2.16
+Requires:      gnutls-libs >= 3.1.4
 Requires:      kmod >= 15
+Requires:      libgpg-error >= 1.12
 %{?with_microhttpd:Requires:   libmicrohttpd >= 0.9.33}
 Requires:      libutempter
 Requires:      polkit
@@ -145,6 +157,7 @@ Requires:   uname(release) >= 3.12
 Suggests:      fsck >= 2.25.0
 Suggests:      service(klogd)
 Suggests:      service(syslog)
+Suggests:      xorg-lib-libxkbcommon >= 0.5.0
 Provides:      group(systemd-coredump)
 Provides:      group(systemd-journal)
 Provides:      group(systemd-journal-remote)
@@ -153,6 +166,7 @@ Provides:   group(systemd-network)
 Provides:      group(systemd-resolve)
 Provides:      group(systemd-timesync)
 Provides:      udev-acl = %{epoch}:%{version}-%{release}
+Provides:      user(systemd-coredump)
 Provides:      user(systemd-journal-remote)
 Provides:      user(systemd-journal-upload)
 Provides:      user(systemd-network)
@@ -161,6 +175,7 @@ Provides:   user(systemd-timesync)
 # kde4 still can't live without ConsoleKit
 #Obsoletes:    ConsoleKit
 #Obsoletes:    ConsoleKit-x11
+Obsoletes:     elogind
 Obsoletes:     systemd-no-compat-tmpfiles
 Obsoletes:     udev-systemd
 # for storage detection / activation services
@@ -441,6 +456,7 @@ Summary:    Shared systemd libraries
 Summary(pl.UTF-8):     Biblioteki współdzielone systemd
 Group:         Libraries
 Requires:      libgcrypt >= 1.4.5
+Requires:      libseccomp >= 2.3.1
 %{?with_selinux:Requires:      libselinux >= 2.6}
 Obsoletes:     nss_myhostname
 
@@ -470,6 +486,7 @@ Summary(pl.UTF-8):  Bashowe dopełnianie składni dla systemd
 Group:         Applications/Shells
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      bash-completion >= 2.0
+Obsoletes:     bash-completion-elogind
 %if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
 %endif
@@ -485,6 +502,7 @@ Summary:    zsh completion for systemd commands
 Summary(pl.UTF-8):     Uzupełnianie parametrów w zsh dla poleceń systemd
 Group:         Applications/Shells
 Requires:      %{name} = %{epoch}:%{version}-%{release}
+Obsoletes:     zsh-completion-elogind
 %if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
 %endif
@@ -634,13 +652,15 @@ cp -p %{SOURCE2} src/systemd_booted.c
 %{__automake}
 
 %configure \
-       CPPFLAGS="%{rpmcppflags} -I/usr/include/lz4" \
        QUOTAON=/sbin/quotaon \
        QUOTACHECK=/sbin/quotacheck \
        SETCAP=/sbin/setcap \
        KILL=/bin/kill \
        KMOD=/sbin/kmod \
        KEXEC=/sbin/kexec \
+       MOUNT=/bin/mount \
+       UMOUNT=/bin/umount \
+       SULOGIN=/sbin/sulogin \
 %if "%{?configure_cache}" == "1"
        --cache-file=%{?configure_cache_file}%{!?configure_cache_file:configure}.cache \
 %endif
@@ -835,6 +855,7 @@ rm -rf $RPM_BUILD_ROOT
 %groupadd -g 320 systemd-journal-upload
 %useradd -u 320 -g 320 -d /var/log/journal -s /bin/false -c "Systemd Journal Upload" systemd-journal-upload
 %groupadd -g 333 systemd-coredump
+%useradd -u 333 -g 333 -d /var/log/journal -s /bin/false -c "Systemd Core Dumper" systemd-coredump
 
 %post
 /bin/systemd-machine-id-setup || :
@@ -848,6 +869,18 @@ if [ $1 -ge 1 ]; then
        /bin/systemctl try-restart systemd-logind.service || :
 fi
 if [ "$1" = "0" ]; then
+       %userremove systemd-coredump
+       %groupremove systemd-coredump
+       %userremove systemd-network
+       %groupremove systemd-network
+       %userremove systemd-resolve
+       %groupremove systemd-resolve
+       %userremove systemd-timesync
+       %groupremove systemd-timesync
+       %userremove systemd-journal-remote
+       %groupremove systemd-journal-remote
+       %userremove systemd-journal-upload
+       %groupremove systemd-journal-upload
        %groupremove systemd-journal
 fi
 
@@ -865,8 +898,8 @@ if [ -f %{_sysconfdir}/vconsole.conf.rpmsave ]; then
        %{__mv} -f %{_sysconfdir}/vconsole.conf.rpmsave %{_sysconfdir}/vconsole.conf
 fi
 
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
+%post  libs -p /sbin/ldconfig
+%postun        libs -p /sbin/ldconfig
 
 %post units
 if [ $1 -eq 1 ]; then
@@ -1183,7 +1216,6 @@ fi
 %{_libexecdir}/systemd/boot/efi/systemd-bootaa64.efi
 %endif
 %endif
-%dir %{_libexecdir}/systemd/catalog
 %{_libexecdir}/systemd/catalog/systemd.catalog
 %lang(be) %{_libexecdir}/systemd/catalog/systemd.be.catalog
 %lang(be) %{_libexecdir}/systemd/catalog/systemd.be@latin.catalog
@@ -1411,6 +1443,7 @@ fi
 %dir %{_libexecdir}/sysctl.d
 %{_libexecdir}/sysctl.d/50-default.conf
 %dir %{_libexecdir}/systemd
+%dir %{_libexecdir}/systemd/catalog
 %dir %{_libexecdir}/systemd/system-shutdown
 %dir %{_libexecdir}/systemd/system-sleep
 %dir %{_libexecdir}/systemd/user
A System and Service Manager
This page took 0.044814 seconds and 4 git commands to generate.