packages were selfconficting, fixing this

2 files changed, 10 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b7078596788e..c66252e1ac81 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = texlive-minionpro-git
 	pkgdesc = generate all necessary files to use Adobe Minion Pro and Adobe Myriad Pro with (pdf)latex.
 	pkgver = r129.ee53cd4
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/sebschub/FontPro.git
 	arch = any
 	license = GPL
@@ -10,8 +10,6 @@ pkgbase = texlive-minionpro-git
 	depends = texlive-core
 	depends = texlive-latexextra
 	depends = texlive-genericextra
-	provides = minionpro
-	conflicts = minionpro
 	source = git+https://github.com/sebschub/FontPro.git
 	source = minionpro.maps
 	source = myriadpro.maps
@@ -20,6 +18,10 @@ pkgbase = texlive-minionpro-git
 	md5sums = 88f9e84c9f4e8418fbbfa1cc3c534b93
 
 pkgname = texlive-minionpro-git
+	provides = minionpro
+	conflicts = minionpro
 
 pkgname = texlive-myriadpro-git
+	provides = myriadpro
+	conflicts = myriadpro
 
diff --git a/PKGBUILD b/PKGBUILD
index f5ed8a6a5328..186024e696eb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,15 +2,13 @@
 
 pkgname=('texlive-minionpro-git' 'texlive-myriadpro-git')
 pkgver=r129.ee53cd4
-pkgrel=2
+pkgrel=3
 pkgdesc="generate all necessary files to use Adobe Minion Pro and Adobe Myriad Pro with (pdf)latex."
 arch=('any')
 url="https://github.com/sebschub/FontPro.git"
 license=('GPL')
 depends=('texlive-core' 'texlive-latexextra' 'texlive-genericextra')
 makedepends=('git' 'acroread-fonts-systemwide')
-provides=('minionpro')
-conflicts=('minionpro')
 source=("git+https://github.com/sebschub/FontPro.git" minionpro.maps myriadpro.maps)
 _gitname="FontPro"
 md5sums=('SKIP'
@@ -30,6 +28,8 @@ prepare() {
 }
 
 package_texlive-minionpro-git() {
+  provides=('minionpro')
+  conflicts=('minionpro')
   cd "$_gitname"
   yes | ./scripts/makeall MinionPro
   yes | ./scripts/install "$pkgdir"/usr/share/texmf
@@ -39,6 +39,8 @@ package_texlive-minionpro-git() {
 }
 
 package_texlive-myriadpro-git() {
+  provides=('myriadpro')
+  conflicts=('myriadpro')
   cd "$_gitname"
   yes | ./scripts/makeall MyriadPro
   yes | ./scripts/install $pkgdir/usr/share/texmf