Split package from Run-Time Engine, and updated dependencies.

3 files changed, 48 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 33540c89adbe..413ef1bfeb4e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = labview-2010
 	pkgdesc = A system-design platform and development environment for a visual programming language from National Instruments.
-	pkgver = 11
+	pkgver = SP0
 	pkgrel = 1
-	url = http://www.ni.com/labview/release-archive/2010/
+	url = https://www.ni.com/labview/release-archive/2010/
 	install = labview-2010.install
-	arch = i686
 	arch = x86_64
 	license = custom:LabVIEW-2010
-	makedepends = rpmextract
 	makedepends = sed
+	makedepends = libarchive
+	depends = labview-2010-rte
 	depends = xdg-utils
 	depends = hicolor-icon-theme
 	depends = desktop-file-utils
@@ -22,7 +22,6 @@ pkgbase = labview-2010
 	source = labview-2010-help-10.0.0-1.i386.rpm
 	source = labview-2010-pro-10.0.0-1.i386.rpm
 	source = labview-2010-ref-10.0.0-1.i386.rpm
-	source = labview-2010-rte-10.0.0-1.i386.rpm
 	source = niexfinder-base-1.0-19.i386.rpm
 	source = niexfinder-labview-2010-10.0.0-1.i386.rpm
 	source = nilvcompare-10.0.0-1.i386.rpm
@@ -38,7 +37,6 @@ pkgbase = labview-2010
 	md5sums = 4473f311612201711144a12313bc6837
 	md5sums = 5646bfdb013790d394969b80a9e621ac
 	md5sums = 630e8fc2155d752118e436b37f19ceb9
-	md5sums = 0566b80b88d805a3a56eed08c4281d78
 	md5sums = 1f237f1937db222ca717034cbd82fb55
 	md5sums = e019e0476940e077cdd97658ac525f22
 	md5sums = 6c1c92c1b61d27e94177f568f7614da6
@@ -47,10 +45,14 @@ pkgbase = labview-2010
 	md5sums = 432bc600994a9c29be67144de730490e
 	md5sums = b2bdb88ba72887a28351dbf37318f655
 	md5sums = a1a1c2c25ae24f9c0e54c1003d772a79
-	depends_x86_64 = lib32-glibc
+	depends_x86_64 = lib32-expat
 	depends_x86_64 = lib32-gcc-libs
+	depends_x86_64 = lib32-glib2
 	depends_x86_64 = lib32-glibc
 	depends_x86_64 = lib32-libdrm
+	depends_x86_64 = lib32-libice
+	depends_x86_64 = lib32-libsm
+	depends_x86_64 = lib32-libstdc++5
 	depends_x86_64 = lib32-libx11
 	depends_x86_64 = lib32-libxau
 	depends_x86_64 = lib32-libxcb
@@ -61,10 +63,15 @@ pkgbase = labview-2010
 	depends_x86_64 = lib32-libxfixes
 	depends_x86_64 = lib32-libxinerama
 	depends_x86_64 = lib32-libxrender
+	depends_x86_64 = lib32-libxshmfence
+	depends_x86_64 = lib32-libxt
 	depends_x86_64 = lib32-libxxf86vm
 	depends_x86_64 = lib32-mesa
+	depends_x86_64 = lib32-mesa-libgl
 	depends_x86_64 = lib32-openssl098
-	depends_x86_64 = lib32-libxt
+	depends_x86_64 = lib32-pcre
+	depends_x86_64 = lib32-util-linux
+	depends_x86_64 = lib32-zlib
 
 pkgname = labview-2010
 
diff --git a/PKGBUILD b/PKGBUILD
index e5cdb68f47ac..b4af1e90a2c9 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,19 +2,25 @@
 # Contributor: Richard Graham <richard@rdg.cc>
 
 _release='2010'
+_short_release="${_release:2:4}"
+_service_pack='0'
 pkgname="labview-${_release}"
-pkgver=11
+pkgver="SP${_service_pack}"
 pkgrel=1
 pkgdesc='A system-design platform and development environment for a visual programming language from National Instruments.'
-url="http://www.ni.com/labview/release-archive/${_release}/"
-arch=('i686' 'x86_64')
+url="https://www.ni.com/labview/release-archive/${_release}/"
+arch=('x86_64') # This will likely work on i686, but I have not tested it.
 license=("custom:LabVIEW-${_release}")
 install="labview-${_release}.install"
-depends=('xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info')
-depends_x86_64+=('lib32-glibc'
+depends=("labview-${_release}-rte" 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info')
+depends_x86_64+=('lib32-expat'
                  'lib32-gcc-libs'
+                 'lib32-glib2'
                  'lib32-glibc'
                  'lib32-libdrm'
+                 'lib32-libice'
+                 'lib32-libsm'
+                 'lib32-libstdc++5'
                  'lib32-libx11'
                  'lib32-libxau'
                  'lib32-libxcb'
@@ -25,26 +31,30 @@ depends_x86_64+=('lib32-glibc'
                  'lib32-libxfixes'
                  'lib32-libxinerama'
                  'lib32-libxrender'
+                 'lib32-libxshmfence'
+                 'lib32-libxt'
                  'lib32-libxxf86vm'
                  'lib32-mesa'
+                 'lib32-mesa-libgl'
                  'lib32-openssl098'
-                 'lib32-libxt')
-makedepends=('rpmextract' 'sed')
+                 'lib32-pcre'
+                 'lib32-util-linux'
+                 'lib32-zlib')
+makedepends=('sed' 'libarchive')
 options=('!strip' '!upx') # Avoid time consuming operations.
 PKGEXT='.pkg.tar' # Do not compress, it's a large package (~1GB).
-source=("labview-${_release}-appbuild-10.0.0-1.i386.rpm"
-        "labview-${_release}-core-10.0.0-1.i386.rpm"
-        "labview-${_release}-desktop-10.0.0-1.i386.rpm"
-        "labview-${_release}-examples-10.0.0-1.i386.rpm"
-        "labview-${_release}-help-10.0.0-1.i386.rpm"
-        "labview-${_release}-pro-10.0.0-1.i386.rpm"
-        "labview-${_release}-ref-10.0.0-1.i386.rpm"
-        "labview-${_release}-rte-10.0.0-1.i386.rpm"
+source=("labview-${_release}-appbuild-${_short_release}.0.${_service_pack}-1.i386.rpm"
+        "labview-${_release}-core-${_short_release}.0.${_service_pack}-1.i386.rpm"
+        "labview-${_release}-desktop-${_short_release}.0.${_service_pack}-1.i386.rpm"
+        "labview-${_release}-examples-${_short_release}.0.${_service_pack}-1.i386.rpm"
+        "labview-${_release}-help-${_short_release}.0.${_service_pack}-1.i386.rpm"
+        "labview-${_release}-pro-${_short_release}.0.${_service_pack}-1.i386.rpm"
+        "labview-${_release}-ref-${_short_release}.0.${_service_pack}-1.i386.rpm"
         "niexfinder-base-1.0-19.i386.rpm"
-        "niexfinder-labview-${_release}-10.0.0-1.i386.rpm"
-        "nilvcompare-10.0.0-1.i386.rpm"
-        "nilvmerge-10.0.0-1.i386.rpm"
-        "nisvcloc-10.0.0-1.i386.rpm"
+        "niexfinder-labview-${_release}-${_short_release}.0.${_service_pack}-1.i386.rpm"
+        "nilvcompare-${_short_release}.0.${_service_pack}-1.i386.rpm"
+        "nilvmerge-${_short_release}.0.${_service_pack}-1.i386.rpm"
+        "nisvcloc-${_short_release}.0.${_service_pack}-1.i386.rpm"
         "niwebpipeline20_dep-2.0-5.i586.rpm"
         "LICENSE.txt"
         "PATENTS.txt")
@@ -55,7 +65,6 @@ md5sums=('003fa58d0e43d74441f1716f8a83fc59'
          '4473f311612201711144a12313bc6837'
          '5646bfdb013790d394969b80a9e621ac'
          '630e8fc2155d752118e436b37f19ceb9'
-         '0566b80b88d805a3a56eed08c4281d78'
          '1f237f1937db222ca717034cbd82fb55'
          'e019e0476940e077cdd97658ac525f22'
          '6c1c92c1b61d27e94177f568f7614da6'
@@ -66,30 +75,13 @@ md5sums=('003fa58d0e43d74441f1716f8a83fc59'
          'a1a1c2c25ae24f9c0e54c1003d772a79')
 
 package() {
-  rpmextract.sh "../labview-${_release}-appbuild-10.0.0-1.i386.rpm"
-  rpmextract.sh "../labview-${_release}-core-10.0.0-1.i386.rpm"
-  rpmextract.sh "../labview-${_release}-desktop-10.0.0-1.i386.rpm"
-  rpmextract.sh "../labview-${_release}-examples-10.0.0-1.i386.rpm"
-  rpmextract.sh "../labview-${_release}-help-10.0.0-1.i386.rpm"
-  rpmextract.sh "../labview-${_release}-pro-10.0.0-1.i386.rpm"
-  rpmextract.sh "../labview-${_release}-ref-10.0.0-1.i386.rpm"
-  rpmextract.sh "../labview-${_release}-rte-10.0.0-1.i386.rpm"
-  rpmextract.sh "../niexfinder-base-1.0-19.i386.rpm"
-  rpmextract.sh "../niexfinder-labview-${_release}-10.0.0-1.i386.rpm"
-  rpmextract.sh "../nilvcompare-10.0.0-1.i386.rpm"
-  rpmextract.sh "../nilvmerge-10.0.0-1.i386.rpm"
-  rpmextract.sh "../nisvcloc-10.0.0-1.i386.rpm"
-  rpmextract.sh "../niwebpipeline20_dep-2.0-5.i586.rpm"
-
-  mkdir -p "${pkgdir}/usr/lib"
   mkdir -p "${pkgdir}/opt"
 
-  mv "${srcdir}/usr/local/lib/*" "${pkgdir}/usr/lib"
-  mv "${srcdir}/usr/local/*" "${pkgdir}/opt"
+  cp -rp "${srcdir}/usr/local/natinst" "${pkgdir}/opt/"
      
   mkdir -p "${pkgdir}/usr/share/licenses/LabVIEW-${_release}"
-  cp "../LICENSE.txt" "${pkgdir}/usr/share/licenses/LabVIEW-${_release}/LICENSE.txt"
-  cp "../PATENTS.txt" "${pkgdir}/usr/share/licenses/LabVIEW-${_release}/PATENTS.txt"
+  cp "${srcdir}/LICENSE.txt" "${pkgdir}/usr/share/licenses/LabVIEW-${_release}/LICENSE.txt"
+  cp "${srcdir}/PATENTS.txt" "${pkgdir}/usr/share/licenses/LabVIEW-${_release}/PATENTS.txt"
 
   mkdir -p "${pkgdir}/usr/share/icons/hicolor/48x48/apps"
   mkdir -p "${pkgdir}/usr/share/icons/hicolor/128x128/apps"
@@ -101,7 +93,7 @@ package() {
   cp "${pkgdir}/opt/natinst/LabVIEW-${_release}/etc/desktop/icons/128x128/labview.png" "${pkgdir}/usr/share/icons/hicolor/128x128/apps/labview.png"
   cp "${pkgdir}/opt/natinst/LabVIEW-${_release}/etc/desktop/icons/128x128/natinst-labview.png" "${pkgdir}/usr/share/icons/hicolor/128x128/apps/natinst-labview.png"
 
-  for file in "${pkgdir}/opt/natinst/LabVIEW-${_release}/etc/desktop/icons/48x48/i-*.png"; do
+  for file in "${pkgdir}"/opt/natinst/LabVIEW-"${_release}"/etc/desktop/icons/48x48/i-*.png; do
     cp "$file" ${pkgdir}/usr/share/icons/hicolor/48x48/mimetypes/`echo ${file##*/} | sed "s,i-,application-x-,"`
     cp "$file" ${pkgdir}/usr/share/icons/hicolor/128x128/mimetypes/`echo ${file##*/} | sed "s,i-,application-x-,"`
   done
diff --git a/labview-2010-rte-10.0.0-1.i386.rpm b/labview-2010-rte-10.0.0-1.i386.rpm
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/labview-2010-rte-10.0.0-1.i386.rpm
+++ /dev/null