summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp A2015-07-03 14:07:13 +0200
committerPhilipp A2015-07-03 14:07:13 +0200
commit553d4b3390ad68741780af315110e2ea6a17b703 (patch)
tree7b2da96b4ea440c538b7596b8e3f0edc1e15af77
parentff4a17eedf6270edf11a2cea133fd22c213c461d (diff)
downloadaur-553d4b3390ad68741780af315110e2ea6a17b703.tar.gz
removed "replaces"
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD3
2 files changed, 2 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5939585c8a6f..7662c424aa1f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = rstudio-desktop
pkgdesc = Open source and enterprise-ready professional software for the R community
pkgver = 0.99.451
- pkgrel = 1
+ pkgrel = 2
url = http://www.rstudio.com/
install = rstudio-desktop.install
arch = i686
@@ -25,9 +25,6 @@ pkgbase = rstudio-desktop
conflicts = rstudio-desktop-bin
conflicts = rstudio-desktop-git
conflicts = rstudio-desktop-preview-bin
- replaces = rstudio-desktop-bin
- replaces = rstudio-desktop-git
- replaces = rstudio-desktop-preview-bin
noextract = core-dictionaries.zip
noextract = gin-1.5.zip
source = rstudio-0.99.451.tar.gz::https://github.com/rstudio/rstudio/tarball/v0.99.451
diff --git a/PKGBUILD b/PKGBUILD
index 78720fa4d0e1..30b021369408 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgver=0.99.451
_gwtver=2.7.0
_ginver=1.5
_clangver=3.6.1
-pkgrel=1
+pkgrel=2
pkgdesc="Open source and enterprise-ready professional software for the R community"
arch=('i686' 'x86_64')
url="http://www.rstudio.com/"
@@ -13,7 +13,6 @@ license=('AGPL')
depends=('r>=2.11.1' 'boost-libs>=1.50' qt5-base qt5-webkit pango shared-mime-info mathjax pandoc clang)
makedepends=('cmake>=2.8' 'boost>=1.50' java-environment apache-ant openssl pam)
conflicts=('rstudio-desktop-bin' 'rstudio-desktop-git' 'rstudio-desktop-preview-bin')
-replaces=('rstudio-desktop-bin' 'rstudio-desktop-git' 'rstudio-desktop-preview-bin')
install=rstudio-desktop.install
source=("rstudio-$pkgver.tar.gz::https://github.com/rstudio/rstudio/tarball/v$pkgver"
"https://s3.amazonaws.com/rstudio-buildtools/gin-$_ginver.zip"