setools 4.1.1-1 update

2 files changed, 11 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5bb0680eca17..2404e3a0151e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = setools
 	pkgdesc = Policy analysis tools for SELinux
-	pkgver = 4.1.0
+	pkgver = 4.1.1
 	pkgrel = 1
 	url = https://github.com/TresysTechnology/setools/wiki
 	arch = i686
@@ -13,7 +13,6 @@ pkgbase = setools
 	makedepends = bison
 	makedepends = flex
 	makedepends = swig
-	makedepends = qt5-tools
 	makedepends = python-setuptools
 	makedepends = python-tox
 	makedepends = python2
@@ -21,7 +20,7 @@ pkgbase = setools
 	makedepends = python2-networkx
 	makedepends = python2-mock
 	makedepends = python2-tox
-	depends = libselinux>=2.5
+	depends = libselinux>=2.7
 	depends = python
 	depends = python-networkx
 	optdepends = python-pyqt5: needed for graphical tools
@@ -29,10 +28,10 @@ pkgbase = setools
 	optdepends = python2-enum34: Python2 support
 	optdepends = python2-networkx: Python2 support
 	optdepends = qt5-tools: display apol help with Qt Assistant
-	provides = selinux-setools=4.1.0-1
+	provides = selinux-setools=4.1.1-1
 	conflicts = selinux-setools
-	source = setools-4.1.0.tar.gz::https://github.com/TresysTechnology/setools/archive/4.1.0.tar.gz
-	sha256sums = cc251572c50298e2705617c8a0ddb5ae7cfe0bde2480bc0c6a4e44341d3df831
+	source = setools-4.1.1.tar.gz::https://github.com/TresysTechnology/setools/archive/4.1.1.tar.gz
+	sha256sums = 46a927ea2b163cbe1d35cc35da43e45853e13720c7e02d4cf75a498783c19610
 
 pkgname = setools
 
diff --git a/PKGBUILD b/PKGBUILD
index e6cbda13204d..f68ccf7ec28b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,27 +15,27 @@
 #   - replace setools 3.3.8 with setools3-libs and install setools then.
 
 pkgname=setools
-pkgver=4.1.0
+pkgver=4.1.1
 pkgrel=1
 pkgdesc="Policy analysis tools for SELinux"
 groups=('selinux')
 arch=('i686' 'x86_64')
 url="https://github.com/TresysTechnology/setools/wiki"
 license=('GPL' 'LGPL')
-depends=('libselinux>=2.5' 'python' 'python-networkx')
+depends=('libselinux>=2.7' 'python' 'python-networkx')
 optdepends=('python-pyqt5: needed for graphical tools'
             'python2: Python2 support'
             'python2-enum34: Python2 support'
             'python2-networkx: Python2 support'
             'qt5-tools: display apol help with Qt Assistant')
-makedepends=('bison' 'flex' 'swig' 'qt5-tools'
+makedepends=('bison' 'flex' 'swig'
              'python-setuptools' 'python-tox'
              'python2' 'python2-setuptools' 'python2-networkx' 'python2-mock' 'python2-tox')
 checkdepends=('checkpolicy' 'python2-enum34')
 conflicts=("selinux-${pkgname}")
 provides=("selinux-${pkgname}=${pkgver}-${pkgrel}")
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/TresysTechnology/setools/archive/${pkgver}.tar.gz")
-sha256sums=('cc251572c50298e2705617c8a0ddb5ae7cfe0bde2480bc0c6a4e44341d3df831')
+sha256sums=('46a927ea2b163cbe1d35cc35da43e45853e13720c7e02d4cf75a498783c19610')
 
 prepare() {
   cd "${pkgname}-${pkgver}"
@@ -48,20 +48,10 @@ prepare() {
   # This a a bug in Flex, https://github.com/westes/flex/issues/155
   # Do not make the build fail because of this
   sed -e "s/'-Werror',//" -i setup.py
-
-  # Install apol.qch too
-  sed "s/\(package_data={'': \['\*\.ui', '\*\.qhc'\)\]/\1, '*.qch']/" -i setup.py
-  echo 'include setoolsui/apol/apol.qch' >> MANIFEST.in
 }
 
 build() {
   cd "${pkgname}-${pkgver}"
-
-  # Rebuild apol help files
-  qcollectiongenerator qhc/apol.qhcp
-  cp -f qhc/apol.qhc setoolsgui/apol/apol.qhc
-  cp -f qhc/apol.qch setoolsgui/apol/apol.qch
-
   python2 setup.py build
   python setup.py build
 }
@@ -74,6 +64,6 @@ check() {
 
 package() {
   cd "${pkgname}-${pkgver}"
-  python2 setup.py install --root="$pkgdir" --optimize=1
-  python setup.py install --root="$pkgdir" --optimize=1
+  python2 setup.py install --root="$pkgdir" --optimize=1 --skip-build
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
 }