summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorYichao Zhou2018-11-17 21:20:08 -0800
committerYichao Zhou2018-11-17 21:20:08 -0800
commite352ff5d3961ebc7bcaaa0be3ae6f7794be505f5 (patch)
treeb591fb99724f4d299c40e58dab14c5161f4cbb4e
parent7523990cfe96d740d98f01873720940dae651cdf (diff)
downloadaur-e352ff5d3961ebc7bcaaa0be3ae6f7794be505f5.tar.gz
remove conflict
-rw-r--r--.SRCINFO22
-rw-r--r--PKGBUILD4
2 files changed, 3 insertions, 23 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e22d20cd1a88..0f4c4a770dc5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = texlive-installer
pkgdesc = This packages provides the installer of texlive. It also tricks Arch into thinking it has its texlive packages installed.
pkgver = 2018
- pkgrel = 1
+ pkgrel = 2
url = http://www.tug.org/texlive/
install = texlive-installer.install
arch = any
@@ -28,26 +28,6 @@ pkgbase = texlive-installer
provides = texlive-langgreek
provides = texlive-langjapanese
provides = texlive-langkorean
- conflicts = texlive-bin
- conflicts = texlive-htmlxml
- conflicts = texlive-bibtexextra
- conflicts = texlive-core
- conflicts = texlive-fontsextra
- conflicts = texlive-formatsextra
- conflicts = texlive-games
- conflicts = texlive-humanities
- conflicts = texlive-latexextra
- conflicts = texlive-music
- conflicts = texlive-pictures
- conflicts = texlive-pstricks
- conflicts = texlive-publishers
- conflicts = texlive-science
- conflicts = texlive-langchinese
- conflicts = texlive-langcyrillic
- conflicts = texlive-langextra
- conflicts = texlive-langgreek
- conflicts = texlive-langjapanese
- conflicts = texlive-langkorean
source = http://mirror.ctan.org/systems/texlive/tlnet/install-tl-unx.tar.gz
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 212d473cc5de..4eee0723b1bb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Yichao Zhou <broken.zhou@gmail.com>
pkgname=texlive-installer
pkgver=2018
-pkgrel=1
+pkgrel=2
pkgdesc="This packages provides the installer of texlive. It also tricks Arch into thinking it has its texlive packages installed."
url="http://www.tug.org/texlive/"
arch=('any')
@@ -10,7 +10,7 @@ depends=('wget' 'xz')
optdepends=()
makedepends=()
replaces=()
-conflicts=('texlive-bin' 'texlive-htmlxml' $(pacman -Sgq texlive-most texlive-lang))
+# conflicts=('texlive-bin' 'texlive-htmlxml' $(pacman -Sgq texlive-most texlive-lang))
provides=('texlive-bin' 'texlive-htmlxml' $(pacman -Sgq texlive-most texlive-lang))
source=("http://mirror.ctan.org/systems/texlive/tlnet/install-tl-unx.tar.gz")
md5sums=('SKIP')