xchat: remove libre suffix and add complex pkgrel

8 files changed, 8 insertions, 10 deletions

diff --git a/libre/xchat-libre/ChangeLog b/libre/xchat/ChangeLog
index faa8383c8..faa8383c8 100644
--- a/libre/xchat-libre/ChangeLog
+++ b/libre/xchat/ChangeLog
diff --git a/libre/xchat-libre/PKGBUILD b/libre/xchat/PKGBUILD
index 50bee2561..0bd62f95e 100644
--- a/libre/xchat-libre/PKGBUILD
+++ b/libre/xchat/PKGBUILD
@@ -3,23 +3,21 @@
 # Maintainer (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=xchat
-pkgname=xchat-libre
+pkgname=xchat
 pkgver=2.8.8
-pkgrel=14
+pkgrel=14.parabola1
 pkgdesc="A GTK+ based IRC client, without nonfree browser reference"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xchat.org/"
-provides=("xchat=$pkgver")
-replaces=('xchat')
-conflicts=('xchat')
+replaces=('xchat-libre')
+conflicts=('xchat-libre')
 license=('GPL')
 depends=('gtk2' 'openssl' 'dbus-glib' 'libnotify' 'hicolor-icon-theme')
 makedepends=('tcl' 'perl' 'python2' 'librsvg')
 optdepends=('enchant: for spell checking support' 'tcl: for tcl plugin'
             'python2: for python plugin')
 install=xchat.install
-source=(http://www.xchat.org/files/source/${pkgver%.*}/${_pkgname}-${pkgver}.tar.xz
+source=(http://www.xchat.org/files/source/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
         http://xchat.org/files/icons/xchat-svg.tar.bz2
         xchat-2.8.8-libnotify07.patch
         xchat-2.8.8-link-against-libnotify.patch
@@ -35,7 +33,7 @@ sha1sums=('e12305da42d1aacc26c2ca25e239f393d4dd3532'
           '20aef0ae608af6b30e1b4249f9c53830f8f514f6')
 
 prepare() {
-  cd ${_pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
   sed -i 's/GDK_HAND1/GDK_HAND2/' src/fe-gtk/xtext.c
   patch -p1 -i "${srcdir}/xchat-2.8.8-libnotify07.patch"
   patch -p1 -i "${srcdir}/xchat-2.8.8-link-against-libnotify.patch"
@@ -45,7 +43,7 @@ prepare() {
 }
 
 build() {
-  cd ${_pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
   autoconf
   autoheader
 
@@ -55,7 +53,7 @@ build() {
 }
 
 package() {
-  cd ${_pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   for i in 24 32 48 64 128 256 ; do
diff --git a/libre/xchat-libre/no-firefox.patch b/libre/xchat/no-firefox.patch
index 60c4846ee..60c4846ee 100644
--- a/libre/xchat-libre/no-firefox.patch
+++ b/libre/xchat/no-firefox.patch
diff --git a/libre/xchat-libre/remove-non-free-suggestion.patch b/libre/xchat/remove-non-free-suggestion.patch
index f20894610..f20894610 100644
--- a/libre/xchat-libre/remove-non-free-suggestion.patch
+++ b/libre/xchat/remove-non-free-suggestion.patch
diff --git a/libre/xchat-libre/xchat-2.8.8-glib-2.31.patch b/libre/xchat/xchat-2.8.8-glib-2.31.patch
index 63f562ff8..63f562ff8 100644
--- a/libre/xchat-libre/xchat-2.8.8-glib-2.31.patch
+++ b/libre/xchat/xchat-2.8.8-glib-2.31.patch
diff --git a/libre/xchat-libre/xchat-2.8.8-libnotify07.patch b/libre/xchat/xchat-2.8.8-libnotify07.patch
index 2a6dce9a2..2a6dce9a2 100644
--- a/libre/xchat-libre/xchat-2.8.8-libnotify07.patch
+++ b/libre/xchat/xchat-2.8.8-libnotify07.patch
diff --git a/libre/xchat-libre/xchat-2.8.8-link-against-libnotify.patch b/libre/xchat/xchat-2.8.8-link-against-libnotify.patch
index 31e6c0854..31e6c0854 100644
--- a/libre/xchat-libre/xchat-2.8.8-link-against-libnotify.patch
+++ b/libre/xchat/xchat-2.8.8-link-against-libnotify.patch
diff --git a/libre/xchat-libre/xchat.install b/libre/xchat/xchat.install
index eab82d16f..eab82d16f 100644
--- a/libre/xchat-libre/xchat.install
+++ b/libre/xchat/xchat.install