mate-icon-theme-faenza: remove libre suffix and add complex pkgrel

2 files changed, 9 insertions, 11 deletions

diff --git a/libre/mate-icon-theme-faenza-libre/PKGBUILD b/libre/mate-icon-theme-faenza/PKGBUILD
index d14c6f390..9cfd15900 100644
--- a/libre/mate-icon-theme-faenza-libre/PKGBUILD
+++ b/libre/mate-icon-theme-faenza/PKGBUILD
@@ -1,27 +1,25 @@
 # Maintainer (Arch): Martin Wimpress <code@flexion.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=mate-icon-theme-faenza
-pkgname=mate-icon-theme-faenza-libre
+pkgname=mate-icon-theme-faenza
 pkgver=1.8.0
-pkgrel=1.1
+pkgrel=1.parabola1
 pkgdesc="Faenza icon theme for MATE, without nonfree distros and application icons"
 url="http://mate-desktop.org"
 arch=('any')
 license=('LGPL')
-replaces=($_pkgname)
-conflicts=($_pkgname)
-provides=($_pkgname=$pkgver)
+replaces=(${pkgname}-libre)
+conflicts=(${pkgname}-libre)
 depends=('hicolor-icon-theme' 'gtk-update-icon-cache')
 makedepends=('icon-naming-utils' 'mate-common')
 options=(!strip)
 groups=('mate-extra')
-source=("http://pub.mate-desktop.org/releases/1.8/${_pkgname}-${pkgver}.tar.xz")
+source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
 sha1sums=('60ecb21261d969e60925254cb435a4a877540d4c')
-install=${_pkgname}.install
+install=${pkgname}.install
 
 prepare() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
+    cd "${srcdir}/${pkgname}-${pkgver}"
     # remove nonfree distros and application logos
     for nonfree in debian fedora mandriva redhat suse ubuntu alien-arena flash rpmdrake teamviewer novell skype; do
      find -name *$nonfree* -delete
@@ -29,14 +27,14 @@ prepare() {
 }
 
 build() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
+    cd "${srcdir}/${pkgname}-${pkgver}"
     ./configure \
         --prefix=/usr
     make
 }
 
 package() {
-    cd "${srcdir}/${_pkgname}-${pkgver}"
+    cd "${srcdir}/${pkgname}-${pkgver}"
     make DESTDIR="${pkgdir}" install
     rm -f "${pkgdir}/usr/share/icons/matefaenza/icon-theme.cache"
 }
diff --git a/libre/mate-icon-theme-faenza-libre/mate-icon-theme-faenza.install b/libre/mate-icon-theme-faenza/mate-icon-theme-faenza.install
index baa61d116..baa61d116 100644
--- a/libre/mate-icon-theme-faenza-libre/mate-icon-theme-faenza.install
+++ b/libre/mate-icon-theme-faenza/mate-icon-theme-faenza.install