[arch-commits] Commit in salt/trunk (PKGBUILD)

Massimiliano Torromeo mtorromeo at archlinux.org
Wed Jul 8 19:28:04 UTC 2020


    Date: Wednesday, July 8, 2020 @ 19:28:04
  Author: mtorromeo
Revision: 661766

Reverted salt 3000 committed by mistake. Sorry!

Modified:
  salt/trunk/PKGBUILD

----------+
 PKGBUILD |   40 +++++++++++++++++-----------------------
 1 file changed, 17 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-08 19:20:45 UTC (rev 661765)
+++ PKGBUILD	2020-07-08 19:28:04 UTC (rev 661766)
@@ -4,8 +4,8 @@
 # Contributor: Christer Edwards <christer.edwards at gmail.com>
 
 pkgname=salt
-pkgver=3001
-pkgrel=2
+pkgver=2019.2.4
+pkgrel=1
 
 pkgdesc='Central system and configuration manager'
 arch=('any')
@@ -15,19 +15,19 @@
 replaces=('salt-zmq' 'salt-raet')
 conflicts=('salt-zmq' 'salt-raet')
 
-depends=('python-jinja'
-         'python-msgpack'
-         'python-yaml'
-         'python-markupsafe'
-         'python-requests'
-         'python-pyzmq'
-         'python-pycryptodome'
-         'python-pycryptodomex'
-         'python-m2crypto'
-         'python-systemd'
-         'python-distro')
+depends=('python2-jinja'
+         'python2-msgpack'
+         'python2-yaml'
+         'python2-markupsafe'
+         'python2-requests'
+         'python2-pyzmq'
+         'python2-crypto'
+         'python2-m2crypto'
+         'python2-systemd'
+         'python2-tornado'
+         'python2-futures')
 optdepends=('dmidecode: decode SMBIOS/DMI tables'
-            'python-pygit2: gitfs support')
+            'python2-pygit2: gitfs support')
 
 backup=('etc/logrotate.d/salt'
         'etc/salt/master'
@@ -37,18 +37,12 @@
 source=("https://pypi.io/packages/source/s/salt/salt-$pkgver.tar.gz"
         salt.logrotate)
 
-sha256sums=('5ca60d1b2cc8e63db50995bd8b117914eeaf57c48ce2b3a3731ee57163adf154'
+sha256sums=('afeb1c95db61c9008f95259c0b27e525c8a9957cbc6f51c40e824a92637d2847'
             'abecc3c1be124c4afffaaeb3ba32b60dfee8ba6dc32189edfa2ad154ecb7a215')
 
-prepare() {
-  cd salt-$pkgver
-  find requirements salt.egg-info/requires.txt -type f -name \*.txt -exec \
-    sed -r 's;^pycrypto\b.*;pycryptodome;' -i {} +
-}
-
 build() {
   cd salt-$pkgver
-  python setup.py build
+  python2 setup.py build
 }
 
 package() {
@@ -55,7 +49,7 @@
   install -Dm644 salt.logrotate "$pkgdir"/etc/logrotate.d/salt
 
   cd salt-$pkgver
-  python setup.py --salt-pidfile-dir="/run/salt" install --root="$pkgdir" --optimize=1 --skip-build
+  python2 setup.py --salt-pidfile-dir="/run/salt" install --root="$pkgdir" --optimize=1 --skip-build
 
   # default config
   install -Dm644 conf/master "$pkgdir/etc/salt/master"


More information about the arch-commits mailing list