[arch-commits] Commit in intel-oneapi-common/trunk (PKGBUILD)

[Konstantin Gizdov]

    Date: Friday, August 26, 2022 @ 14:23:53
  Author: kgizdov
Revision: 1282566

upgpkg: intel-oneapi-common 2022.1.0-3: reorder license dirs and conflict basekit

Modified:
  intel-oneapi-common/trunk/PKGBUILD

----------+
 PKGBUILD |   35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-26 14:23:49 UTC (rev 1282565)
+++ PKGBUILD	2022-08-26 14:23:53 UTC (rev 1282566)
@@ -6,7 +6,7 @@
 pkgname="${_pkgname}-common"
 pkgver='2022.1.0'
 _debpkgrel='161'
-pkgrel=2
+pkgrel=3
 pkgdesc="Intel's oneAPI common variables and licensing"
 arch=('any')
 url='https://software.intel.com/content/www/us/en/develop/tools/oneapi.html'
@@ -15,29 +15,32 @@
         "https://apt.repos.intel.com/oneapi/pool/main/${pkgname}-licensing-${pkgver}-${pkgver}-${_debpkgrel}_all.deb")
 b2sums=('e2e2d4028594e94e66e5d8a7187aac8fb7c1729164b846842840dc618c3a3e31e68183caf5c146a9ff85f03a64f9b9ee395db18295098ce15d2d2b7b9033ccc3'
         'ec8c7fb6309cdf0278cf1cbfaea952f37217a3f78c4d7d85994ac1e5252539c781b4d42d070a7aff23502eb116bf8889125dcd3d3ad2ae4f7a56519c9606fcc0')
+depends=('sh')
 optdepends=("procps-ng: Sourcing /opt/intel/oneapi/setvars.sh")
 noextract=(
-	"${pkgname}-vars-${pkgver}-${_debpkgrel}_all.deb"
-	"${pkgname}-licensing-${pkgver}-${pkgver}-${_debpkgrel}_all.deb"
+    "${pkgname}-vars-${pkgver}-${_debpkgrel}_all.deb"
+    "${pkgname}-licensing-${pkgver}-${pkgver}-${_debpkgrel}_all.deb"
 )
+conflicts=('intel-oneapi-basekit')
+
 build() {
-    cd "${srcdir}"
     mkdir vars licensing package
 
-    cd "${srcdir}"/vars
-	ar x "${srcdir}/${pkgname}-vars-${pkgver}-${_debpkgrel}_all.deb"
-	tar xvf data.tar.xz -C "${srcdir}"/package
-
-    cd "${srcdir}"/licensing
-	ar x "${srcdir}/${pkgname}-licensing-${pkgver}-${pkgver}-${_debpkgrel}_all.deb"
-	tar xvf data.tar.xz -C "${srcdir}"/package
 }
 
 package() {
-	mv "${srcdir}"/package/opt "${pkgdir}"
-	ln -sfT "${pkgver}" "${pkgdir}"/opt/intel/oneapi/licensing/latest
-    install -d "${pkgdir}"/usr/share/licenses/"${_pkgname}"
-    ln -s /opt/intel/oneapi/licensing/latest "${pkgdir}"/usr/share/licenses/"${_pkgname}"/latest
-    ln -s "${_pkgname}" "${pkgdir}"/usr/share/licenses/"${pkgname}"
+    cd "${srcdir}"
+    ar x "${srcdir}/${pkgname}-vars-${pkgver}-${_debpkgrel}_all.deb"
+    tar xvf data.tar.xz -C "${pkgdir}"
+    rm data.tar.xz
+
+    ar x "${srcdir}/${pkgname}-licensing-${pkgver}-${pkgver}-${_debpkgrel}_all.deb"
+    tar xvf data.tar.xz -C "${pkgdir}"
+    rm data.tar.xz
+
+    ln -sfT "${pkgver}" "${pkgdir}"/opt/intel/oneapi/licensing/latest
+    install -d "${pkgdir}"/usr/share/licenses/"${pkgname}"
+    ln -s /opt/intel/oneapi/licensing/latest "${pkgdir}"/usr/share/licenses/"${pkgname}"/latest
+    ln -s "${pkgname}" "${pkgdir}"/usr/share/licenses/"${_pkgname}"
     ls -lah "${pkgdir}"/usr/share/licenses
 }