diff options
| author | Sven Hebrok | 2023-01-13 13:28:16 +0100 |
|---|---|---|
| committer | Sven Hebrok | 2023-01-13 13:28:16 +0100 |
| commit | e22a656754bd9c949889ba75c1e1fa685bfcb04d (patch) | |
| tree | 50099dd4905368aba425ebad50149d64f8c077bd | |
| parent | af656e53bf6ad4f9d4d303ec88032e2fc2739798 (diff) | |
| download | aur-e22a656754bd9c949889ba75c1e1fa685bfcb04d.tar.gz | |
Fix dependencies not fulfillable
| -rw-r--r-- | .SRCINFO | 7 | ||||
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rw-r--r-- | _patch.sed | 9 |
3 files changed, 10 insertions, 12 deletions
@@ -1,5 +1,4 @@ pkgbase = cups-gssapi - pkgdesc = The CUPS Printing System with gssapi (kerberos) enabled pkgver = 2.4.2 pkgrel = 3 epoch = 1 @@ -29,8 +28,6 @@ pkgbase = cups-gssapi makedepends = libpaper makedepends = valgrind makedepends = git - conflicts = libcups - conflicts = cups source = https://github.com/OpenPrinting/cups/releases/download/v2.4.2/cups-2.4.2-source.tar.gz source = https://github.com/OpenPrinting/cups/releases/download/v2.4.2/cups-2.4.2-source.tar.gz.sig source = cups.logrotate @@ -60,7 +57,8 @@ pkgname = libcups-gssapi depends = avahi depends = libusb depends = libxcrypt - provides = libcups + provides = libcups=2.4.2 + conflicts = libcups pkgname = cups-gssapi pkgdesc = The CUPS Printing System - daemon package - with gssapi (kerberos) enabled @@ -79,6 +77,7 @@ pkgname = cups-gssapi optdepends = colord: for ICC color profile support optdepends = logrotate: for logfile rotation support provides = cups + conflicts = cups backup = etc/cups/cupsd.conf backup = etc/cups/snmp.conf backup = etc/cups/printers.conf @@ -2,8 +2,6 @@ # Automatically created from cuops PKGBUILD # Upstream Maintainer: Andreas Radke <andyrtr@archlinux.org> -pkgdesc="The CUPS Printing System with gssapi (kerberos) enabled" -conflicts=('libcups' 'cups') pkgbase="cups-gssapi" pkgname=('libcups-gssapi' 'cups-gssapi') pkgver=2.4.2 @@ -102,7 +100,8 @@ check() { } package_libcups-gssapi() { -provides=('libcups') +provides=("libcups=${pkgver%.r*}") +conflicts=('libcups') pkgdesc="The CUPS Printing System - client libraries and headers - with gssapi (kerberos) enabled" depends=('gnutls' 'libtiff>=4.0.0' 'libpng>=1.5.7' 'krb5' 'avahi' 'libusb' 'libxcrypt') @@ -118,6 +117,7 @@ depends=('gnutls' 'libtiff>=4.0.0' 'libpng>=1.5.7' 'krb5' 'avahi' 'libusb' 'libx package_cups-gssapi() { provides=('cups') +conflicts=('cups') pkgdesc="The CUPS Printing System - daemon package - with gssapi (kerberos) enabled" install=cups.install backup=(etc/cups/cupsd.conf diff --git a/_patch.sed b/_patch.sed index 5f4c2e6e7a59..90cf2d5898a5 100644 --- a/_patch.sed +++ b/_patch.sed @@ -12,13 +12,12 @@ s/.\/configure (.+) \\/.\/configure \1 --with-gssapi \\/ # Replace description of subpackages /^pkgdesc=/ s/(.*)"$/\1 - with gssapi (kerberos) enabled"/ -# add further fields -/^pkgbase=/ i pkgdesc="The CUPS Printing System with gssapi (kerberos) enabled" -/^pkgbase=/ i conflicts=('libcups' 'cups') - # add provides fields to subpackages /^package_cups-gssapi\(\)/ a provides=('cups') -/^package_libcups-gssapi\(\)/ a provides=('libcups') +/^package_libcups-gssapi\(\)/ a provides=("libcups=${pkgver%.r*}") + +/^package_cups-gssapi\(\)/ a conflicts=('cups') +/^package_libcups-gssapi\(\)/ a conflicts=('libcups') # fix usage of "${pkgbase}" s/\$\{pkgbase\}/cups/g |