updated to 3.4.1

3 files changed, 48 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cc7e2ad3dd6f..e7c5a6627b10 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = microsoft-r-open
 	pkgdesc = Language and environment for statistical computing and graphics, enhanced by Microsoft
-	pkgver = 3.4.0
+	pkgver = 3.4.1
 	pkgrel = 1
 	url = https://mran.revolutionanalytics.com/open/
 	install = microsoft-r-open.install
@@ -30,7 +30,7 @@ pkgbase = microsoft-r-open
 	depends = zlib
 	optdepends = tk: tcl/tk interface
 	optdepends = texlive-bin: latex sty files
-	provides = r=3.4.0
+	provides = r=3.4.1
 	conflicts = r
 	options = !makeflags
 	options = !emptydirs
@@ -39,18 +39,18 @@ pkgbase = microsoft-r-open
 	backup = etc/R/ldpaths
 	backup = etc/R/repositories
 	backup = etc/R/javaconf
-	source = https://mran.revolutionanalytics.com/install/mro/3.4.0/microsoft-r-open-3.4.0.tar.gz
+	source = https://mran.revolutionanalytics.com/install/mro/3.4.1/microsoft-r-open-3.4.1.tar.gz
 	source = mro.desktop
 	source = mro.png
 	source = R.conf
-	md5sums = 4e6ceae0641a1224d944de6c75988025
+	md5sums = 3a0a94d942f3388662cb6c000c71c963
 	md5sums = 70e8f9d0b1eebeb1f0b45f4568bc0701
 	md5sums = 8e0c51650b8a63f110fa7b09e699e9c4
-	md5sums = 6c381ed007c2bfc97ab42f05bf50b57d
-	sha512sums = a5f9e01fb15b4b46a71b3692376f64ae2771419620a0be496d089cb295666ea1c669146ea9c1e923e2595f5ae5216c8c105484b224317023c7fce6862c29aaf6
+	md5sums = 1dfa62c812aed9642f6e4ac34999b9fe
+	sha512sums = e74c203e6bf75bbc83993580b204679b0c93a91d9d1ab641631cc34bd279eb8f88dc5416fa148862efd99239550e3e086d13a94e6b1b7cea68ebf5fa9bc29b72
 	sha512sums = 2b0221bd1e0fdd399284333e6f2020bb9ad11395ad39dd2fca688b7ebc68fbbc60de59a757e1898be8bcd9e2926afccc121043f38445e7693f177c3076f92b61
 	sha512sums = 1491b01d3d14b86d26c383e00e2305858a52ddd498158c9f7f6b33026ee01f246408b1676cffea73f7783c8c4cf546285705c43c0286adbd75ad77706918b5fe
-	sha512sums = 41e6779500748eee0fa785a20bcaf7323d4aa67000386243fdfe1681152023fb4a5dd4e1f078eeae24db18c223f86fa57afbbad391da226988b0a14eec75c986
+	sha512sums = aae388c5b6c02d9fb857914032b0cd7d68a9f21e30c39ba11f5a29aaf1d742545482054b57ce18872eabb6605bbb359b2fc1e9be5ce6881443fdbdf6b67fab3b
 
 pkgname = microsoft-r-open
 
diff --git a/PKGBUILD b/PKGBUILD
index 1cfae0c50575..50a0add617fa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
 # Maintainer: Alexander Phinikarides (alexisph -at- gmail -dot- com)
 
 pkgname=microsoft-r-open
-pkgver=3.4.0
+pkgver=3.4.1
 pkgrel=1
 _majorver=3.4
-_mrandate=2017-05-01
+_mrandate=2017-09-01
 pkgdesc="Language and environment for statistical computing and graphics, enhanced by Microsoft"
 arch=('x86_64')
 license=('GPL')
@@ -46,96 +46,91 @@ source=("https://mran.revolutionanalytics.com/install/mro/${pkgver}/microsoft-r-
         'mro.desktop'
         'mro.png'
         'R.conf')
-md5sums=('4e6ceae0641a1224d944de6c75988025'
+md5sums=('3a0a94d942f3388662cb6c000c71c963'
          '70e8f9d0b1eebeb1f0b45f4568bc0701'
          '8e0c51650b8a63f110fa7b09e699e9c4'
-         '6c381ed007c2bfc97ab42f05bf50b57d')
-sha512sums=('a5f9e01fb15b4b46a71b3692376f64ae2771419620a0be496d089cb295666ea1c669146ea9c1e923e2595f5ae5216c8c105484b224317023c7fce6862c29aaf6'
+         '1dfa62c812aed9642f6e4ac34999b9fe')
+sha512sums=('e74c203e6bf75bbc83993580b204679b0c93a91d9d1ab641631cc34bd279eb8f88dc5416fa148862efd99239550e3e086d13a94e6b1b7cea68ebf5fa9bc29b72'
             '2b0221bd1e0fdd399284333e6f2020bb9ad11395ad39dd2fca688b7ebc68fbbc60de59a757e1898be8bcd9e2926afccc121043f38445e7693f177c3076f92b61'
             '1491b01d3d14b86d26c383e00e2305858a52ddd498158c9f7f6b33026ee01f246408b1676cffea73f7783c8c4cf546285705c43c0286adbd75ad77706918b5fe'
-            '41e6779500748eee0fa785a20bcaf7323d4aa67000386243fdfe1681152023fb4a5dd4e1f078eeae24db18c223f86fa57afbbad391da226988b0a14eec75c986')
+            'aae388c5b6c02d9fb857914032b0cd7d68a9f21e30c39ba11f5a29aaf1d742545482054b57ce18872eabb6605bbb359b2fc1e9be5ce6881443fdbdf6b67fab3b')
 
 prepare() {
   cd ${pkgname}
   # extract rpms
-  bsdtar -xf "rpm/${pkgname}-mro-${_majorver}.rpm"
-  bsdtar -xf "rpm/${pkgname}-mkl-${_majorver}.rpm"
-  bsdtar -xf "rpm/${pkgname}-foreachiterators-${_majorver}.rpm"
-  mv usr/lib64 usr/lib
+  bsdtar -xf "rpm/${pkgname}-mro-${pkgver}.rpm"
+  bsdtar -xf "rpm/${pkgname}-mkl-${pkgver}.rpm"
+  bsdtar -xf "rpm/${pkgname}-foreachiterators-${pkgver}.rpm"
 }
 
 package() {
   cd ${pkgname}
-  cp -r usr "${pkgdir}"
+  mv opt/microsoft/ropen/${pkgver}/lib64 opt/microsoft/ropen/${pkgver}/lib
+  mv opt/microsoft/ropen/${pkgver} "${pkgdir}/usr"
 
   # Install MKL libs
-  install -d "${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64/R/backup/lib"
-  mv ${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64/R/lib/*.so "${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64/R/backup/lib"
-  install -Dm644 "${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64/R/backup/lib/libR.so" "${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64/R/lib/libR.so"
-  install -Dm644 ${pkgdir}/usr/lib/microsoft-r/${_majorver}/stage/Linux/bin/x64/*.so "${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64/R/lib"
-  rm -rf ${pkgdir}/usr/lib/microsoft-r/${_majorver}/stage
+  install -d "${pkgdir}/usr/lib/R/backup/lib"
+  mv ${pkgdir}/usr/lib/R/lib/*.so "${pkgdir}/usr/lib/R/backup/lib"
+  install -Dm644 "${pkgdir}/usr/lib/R/backup/lib/libR.so" "${pkgdir}/usr/lib/R/lib/libR.so"
+  install -Dm644 ${pkgdir}/usr/stage/Linux/bin/x64/*.so "${pkgdir}/usr/lib/R/lib"
+  rm -rf ${pkgdir}/usr/stage
 
   # Link R binaries to system path
   install -d "${pkgdir}/usr/bin"
   cd "${pkgdir}/usr/bin"
-  ln -s ../lib/microsoft-r/${_majorver}/lib64/R/bin/R
-  ln -s ../lib/microsoft-r/${_majorver}/lib64/R/bin/Rscript
-
-  # Install freedesktop.org compatibility
-  install -Dm644 "${srcdir}/mro.desktop" "${pkgdir}/usr/share/applications/mro.desktop"
-  install -Dm644 "${srcdir}/mro.png" "${pkgdir}/usr/share/pixmaps/mro.png"
+  ln -s ../lib/R/bin/R
+  ln -s ../lib/R/bin/Rscript
 
   # Create etc config directory
   install -d "${pkgdir}/etc/R"
-  cd "${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64/R/etc"
+  cd "${pkgdir}/usr/lib/R/etc"
   for i in *; do
     mv -f ${i} "${pkgdir}/etc/R"
     ln -s /etc/R/${i} ${i}
   done
-  # fix a typo
+  # fix typos
   sed -i "s|IMPLEMENTATIN|IMPLEMENTATION|g" "${pkgdir}/etc/R/Makeconf"
+  sed -i "s|3.3|3.4|g" "${pkgdir}/etc/R/Renviron"
 
   # Ensure other applications can access the shared libs
   install -Dm644 "${srcdir}/R.conf" "${pkgdir}/etc/ld.so.conf.d/R.conf"
   sed -i "s/VERSION/${_majorver}/" "${pkgdir}/etc/ld.so.conf.d/R.conf"
 
   # Install pkgconfig file
-  cd "${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64"
-  sed -i "s|rhome=.*$|rhome=/usr/lib/microsoft-r/${_majorver}/lib64/R|" pkgconfig/libR.pc
+  cd "${pkgdir}/usr/lib/"
+  sed -i "s|rhome=.*$|rhome=/usr/lib/R|" pkgconfig/libR.pc
   sed -i "s|rincludedir=.*$|rincludedir=/usr/include/R|" pkgconfig/libR.pc
   sed -i "s|-L/builddir/vendor/build/lib||" pkgconfig/libR.pc
-  install -Dm644 pkgconfig/libR.pc "${pkgdir}/usr/lib/pkgconfig/libR.pc"
 
   # Install header files
   install -d "${pkgdir}/usr/include/R"
-  cp -r ${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64/R/include/* "${pkgdir}/usr/include/R/"
+  cp -r ${pkgdir}/usr/lib/R/include/* "${pkgdir}/usr/include/R/"
 
   # Install man pages
-  cd "${pkgdir}/usr/lib/microsoft-r/${_majorver}/share/man/man1"
+  cd "${pkgdir}/usr/share/man/man1"
   gzip -9 *
-  install -Dm644 R.1.gz "${pkgdir}/usr/share/man/man1/R.1.gz"
-  install -Dm644 Rscript.1.gz "${pkgdir}/usr/share/man/man1/Rscript.1.gz"
-  gzip -d *
 
   # Install shared files
   install -d "${pkgdir}/usr/share/R"
-  cp -r "${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64/R/share/dictionaries" "${pkgdir}/usr/share/R/"
-  cp -r "${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64/R/share/encodings" "${pkgdir}/usr/share/R/"
-  cp -r "${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64/R/share/java" "${pkgdir}/usr/share/R/"
-  cp -r "${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64/R/share/licenses" "${pkgdir}/usr/share/R/"
-  cp -r "${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64/R/share/make" "${pkgdir}/usr/share/R/"
-  cp -r "${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64/R/share/R" "${pkgdir}/usr/share/R/"
-  cp -r "${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64/R/share/Rd" "${pkgdir}/usr/share/R/"
-  cp -r "${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64/R/share/sh" "${pkgdir}/usr/share/R/"
+  cp -r "${pkgdir}/usr/lib/R/share/dictionaries" "${pkgdir}/usr/share/R/"
+  cp -r "${pkgdir}/usr/lib/R/share/encodings" "${pkgdir}/usr/share/R/"
+  cp -r "${pkgdir}/usr/lib/R/share/java" "${pkgdir}/usr/share/R/"
+  cp -r "${pkgdir}/usr/lib/R/share/licenses" "${pkgdir}/usr/share/R/"
+  cp -r "${pkgdir}/usr/lib/R/share/make" "${pkgdir}/usr/share/R/"
+  cp -r "${pkgdir}/usr/lib/R/share/R" "${pkgdir}/usr/share/R/"
+  cp -r "${pkgdir}/usr/lib/R/share/Rd" "${pkgdir}/usr/share/R/"
+  cp -r "${pkgdir}/usr/lib/R/share/sh" "${pkgdir}/usr/share/R/"
   # LaTeX templates
-  cp -r "${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64/R/share/texmf" "${pkgdir}/usr/share/"
+  cp -r "${pkgdir}/usr/lib/R/share/texmf" "${pkgdir}/usr/share/"
 
   # Install docs
   install -d "${pkgdir}/usr/share/doc/R"
-  cp -r ${pkgdir}/usr/lib/microsoft-r/${_majorver}/lib64/R/doc/* "${pkgdir}/usr/share/doc/R/"
-
+  cp -r ${pkgdir}/usr/lib/R/doc/* "${pkgdir}/usr/share/doc/R/"
   # Copy EULAs
-  install -d "${pkgdir}/opt/${pkgname}/doc"
-  install -m644 ${srcdir}/${pkgname}/*.txt "${pkgdir}/opt/${pkgname}/doc"
+  install -m644 ${srcdir}/${pkgname}/*.txt "${pkgdir}/usr/share/doc/R/"
+
+  # Install freedesktop.org compatibility
+  install -Dm644 "${srcdir}/mro.desktop" "${pkgdir}/usr/share/applications/mro.desktop"
+  install -Dm644 "${srcdir}/mro.png" "${pkgdir}/usr/share/pixmaps/mro.png"
 }
 
diff --git a/R.conf b/R.conf
index 63145a2ac4c6..e360859db790 100644
--- a/R.conf
+++ b/R.conf
@@ -1,2 +1,2 @@
-/usr/lib/microsoft-r/VERSION/lib64/R/lib
+/usr/lib/R/lib