diff --git a/xkeyboard-config/PKGBUILD b/xkeyboard-config-ducky/PKGBUILD similarity index 85% rename from xkeyboard-config/PKGBUILD rename to xkeyboard-config-ducky/PKGBUILD index 6b8bd41..7847099 100644 --- a/xkeyboard-config/PKGBUILD +++ b/xkeyboard-config-ducky/PKGBUILD @@ -7,7 +7,8 @@ # # they don't make those keyboards any more :( -pkgname=xkeyboard-config +_pkgname=xkeyboard-config +pkgname=xkeyboard-config-ducky pkgver=2.22 pkgrel=1 pkgdesc="X keyboard configuration files" @@ -15,10 +16,10 @@ arch=(any) license=('custom') url="https://www.freedesktop.org/wiki/Software/XKeyboardConfig" makedepends=('intltool' 'xorg-xkbcomp' 'libxslt') -provides=('xkbdata') -replaces=('xkbdata') -conflicts=('xkbdata') -source=("https://xorg.freedesktop.org/archive/individual/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2" +provides=('xkbdata' "${_pkgname}") +replaces=('xkbdata' "${_pkgname}") +conflicts=('xkbdata' "${_pkgname}") +source=("https://xorg.freedesktop.org/archive/individual/data/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2" 'ducky_mini' 'ru.patch' 'us.patch') @@ -28,7 +29,7 @@ sha256sums=('deaec9989fbc443358b43864437b7b6d39caff07890a4a8055105ce9fcaa59bd' '215471b50a3c9544dd2e185cc34dd60bec3be8c54c12ed66723f81846f73eb38') build() { - cd ${pkgname}-${pkgver} + cd ${_pkgname}-${pkgver} cp -v ${srcdir}/ducky_mini symbols patch -p1 < ${srcdir}/ru.patch patch -p1 < ${srcdir}/us.patch @@ -40,7 +41,7 @@ build() { } package() { - cd ${pkgname}-${pkgver} + cd ${_pkgname}-${pkgver} make DESTDIR="${pkgdir}" install rm -f "${pkgdir}/usr/share/X11/xkb/compiled" diff --git a/xkeyboard-config/ducky_mini b/xkeyboard-config-ducky/ducky_mini similarity index 100% rename from xkeyboard-config/ducky_mini rename to xkeyboard-config-ducky/ducky_mini diff --git a/xkeyboard-config/ru.patch b/xkeyboard-config-ducky/ru.patch similarity index 100% rename from xkeyboard-config/ru.patch rename to xkeyboard-config-ducky/ru.patch diff --git a/xkeyboard-config/us.patch b/xkeyboard-config-ducky/us.patch similarity index 100% rename from xkeyboard-config/us.patch rename to xkeyboard-config-ducky/us.patch