diff options
| author | Nicolas Iooss | 2013-12-20 22:34:30 +0100 |
|---|---|---|
| committer | Timothée Ravier | 2014-01-02 21:54:50 +0100 |
| commit | 661c92de175e3c3d4898ec6845963196bde4b6e2 (patch) | |
| tree | b76a9b27de0647c5403fc768ec5e01fc9155b0da | |
| parent | b393925cb24c2570fda1b97ff79b6cd23ce9e7d4 (diff) | |
| download | aur-661c92de175e3c3d4898ec6845963196bde4b6e2.tar.gz | |
Add conflicts and provides declarations
This eases the upgrade from selinux- and selinux-usr- packages to new package names
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 8 |
2 files changed, 8 insertions, 4 deletions
@@ -70,10 +70,12 @@ pkgname = systemd-selinux conflicts = systemd-tools conflicts = udev conflicts = systemd + conflicts = selinux-systemd replaces = libsystemd replaces = nss-myhostname replaces = systemd-tools replaces = udev + replaces = selinux-systemd backup = etc/dbus-1/system.d/org.freedesktop.systemd1.conf backup = etc/dbus-1/system.d/org.freedesktop.hostname1.conf backup = etc/dbus-1/system.d/org.freedesktop.login1.conf @@ -95,6 +97,8 @@ pkgname = systemd-sysvcompat-selinux depends = sysvinit-tools depends = systemd-selinux provides = systemd-sysvcompat-sysvcompat=208-2 + provides = selinux-systemd-sysvcompat-sysvcompat=208-2 conflicts = sysvinit conflicts = systemd-sysvcompat + conflicts = selinux-systemd-sysvcompat @@ -68,8 +68,8 @@ package_systemd-selinux() { provides=("libsystemd=$pkgver" 'nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver" 'libgudev-1.0.so' 'libsystemd-daemon.so' 'libsystemd-id128.so' 'libsystemd-journal.so' 'libsystemd-login.so' 'libudev.so') - replaces=('libsystemd' 'nss-myhostname' 'systemd-tools' 'udev') - conflicts=('libsystemd' 'nss-myhostname' 'systemd-tools' 'udev' 'systemd') + replaces=('libsystemd' 'nss-myhostname' 'systemd-tools' 'udev' 'selinux-systemd') + conflicts=('libsystemd' 'nss-myhostname' 'systemd-tools' 'udev' 'systemd' 'selinux-systemd') provides=("${pkgname/-selinux}=${pkgver}-${pkgrel}") optdepends=('cryptsetup: required for encrypted block devices' 'libmicrohttpd: systemd-journal-gatewayd' @@ -139,8 +139,8 @@ package_systemd-sysvcompat-selinux() { pkgdesc="sysvinit compat for systemd" license=('GPL2') groups=('selinux') - conflicts=('sysvinit' 'systemd-sysvcompat') - provides=("${pkgname/-selinux}-sysvcompat=${pkgver}-${pkgrel}") + conflicts=('sysvinit' 'systemd-sysvcompat' 'selinux-systemd-sysvcompat') + provides=("${pkgname/-selinux}-sysvcompat=${pkgver}-${pkgrel}" "selinux-${pkgname/-selinux}-sysvcompat=${pkgver}-${pkgrel}") depends=('sysvinit-tools' 'systemd-selinux') mv "$srcdir/_sysvcompat"/* "$pkgdir" |