From 778aba6720650870cb9f20b7b2ee9830863399fa Mon Sep 17 00:00:00 2001
From: Omar Vega Ramos <ovruni@gnu.org.pe>
Date: Thu, 19 May 2016 05:50:25 -0500
Subject: protobuf-java-2.6.1-1.1: rebuild

---
 pcr/protobuf-java/PKGBUILD | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'pcr')

diff --git a/pcr/protobuf-java/PKGBUILD b/pcr/protobuf-java/PKGBUILD
index b4f283774..33a08201e 100644
--- a/pcr/protobuf-java/PKGBUILD
+++ b/pcr/protobuf-java/PKGBUILD
@@ -3,15 +3,13 @@
 _libname=protobuf
 pkgname=${_libname}-java
 pkgver=2.6.1
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Google's data interchange format utility (java API)."
 url="http://code.google.com/p/protobuf/"
 license=('custom:BSD')
 arch=('any')
 depends=('java-runtime')
 makedepends=('java-environment' 'jh' "${_libname}>=${pkgver}")
-conflicts=('google-gson')
-replaces=('google-gson')
 source=("https://github.com/google/${_libname}/releases/download/v${pkgver}/${_libname}-${pkgver}.tar.gz"
         'protobuf-java.patch')
 sha256sums=('dbbd7bdd2381633995404de65a945ff1a7610b0da14593051b4738c90c6dd164'
-- 
cgit v1.2.3