rp-pppoe: remove libre suffix and add complex pkgrel

6 files changed, 14 insertions, 16 deletions

diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe/PKGBUILD
index 7c4952e9a..218591511 100644
--- a/libre/rp-pppoe-libre/PKGBUILD
+++ b/libre/rp-pppoe/PKGBUILD
@@ -1,47 +1,45 @@
-# $Id: PKGBUILD 206300 2014-02-23 17:13:12Z thomas $
+# $Id: PKGBUILD 220603 2014-08-23 13:00:49Z heftig $
 # Maintainer (Arch): Daniel Isenmann <daniel@archlinux.org>
 # Contributor (Arch): orelien <aurelien.foret@wanadoo.fr>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
-_pkgname=rp-pppoe
-pkgname=rp-pppoe-libre
+pkgname=rp-pppoe
 pkgver=3.11
-pkgrel=5
+pkgrel=7.parabola1
 pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client, without nonfree ServPoET recommendation"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.roaringpenguin.com/pppoe/"
 license=('GPL')
-depends=('ppp=2.4.6' 'sh' 'net-tools')
+depends=('ppp=2.4.7' 'sh' 'net-tools')
 backup=(etc/ppp/pppoe.conf etc/ppp/firewall-standalone etc/ppp/firewall-masq 
         etc/ppp/pppoe-server-options)
 options=('!makeflags')
-provides=("rp-pppoe=$pkgver")
-replaces=('rp-pppoe')
-conflicts=('rp-pppoe')
+replaces=('rp-pppoe-libre')
+conflicts=('rp-pppoe-libre')
 install=rp-pppoe.install
 source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz{,.sig} 
        adsl.service 
        kmode.patch
-       $pkgname.patch)
+       libre.patch)
 
 prepare() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
   
   ## Adding patch to remove nonfree software recommendation (ServPoET)
-  patch -Np1 -i "$srcdir/rp-pppoe-libre.patch"
+  patch -Np1 -i "$srcdir/libre.patch"
 
-  cd "$srcdir/$_pkgname-$pkgver/src"
+  cd "$srcdir/$pkgname-$pkgver/src"
   patch -Np2 -i ../../kmode.patch
 }
 
 build() {
-  cd "$srcdir/$_pkgname-$pkgver/src"
+  cd "$srcdir/$pkgname-$pkgver/src"
   ./configure --prefix=/usr --sbindir=/usr/bin --enable-plugin
   make PLUGIN_DIR="/usr/lib/rp-pppoe" all rp-pppoe.so
 }
 
 package() {
-  cd "$srcdir/$_pkgname-$pkgver/src"
+  cd "$srcdir/$pkgname-$pkgver/src"
   make PLUGIN_DIR="/usr/lib/rp-pppoe" DESTDIR="$pkgdir" install
 
   #install -Dm755 "$srcdir/adsl" "$pkgdir/etc/rc.d/adsl"
@@ -49,6 +47,6 @@ package() {
 }
 md5sums=('13b5900c56bd602df6cc526e5e520722'
          'SKIP'
-         '45dc8fc3d0341a3930182a480859ad76'
+         '926b00aa2a0c0d3a21970acde9695e47'
          'd38a903a247d689ff0323d7b6caa1c6b'
          '3c53d550ac408608abb0b6cd6b76b6c2')
diff --git a/libre/rp-pppoe-libre/adsl b/libre/rp-pppoe/adsl
index 33bd91839..33bd91839 100644
--- a/libre/rp-pppoe-libre/adsl
+++ b/libre/rp-pppoe/adsl
diff --git a/libre/rp-pppoe-libre/adsl.service b/libre/rp-pppoe/adsl.service
index f9a2fdcc6..85ff49287 100644
--- a/libre/rp-pppoe-libre/adsl.service
+++ b/libre/rp-pppoe/adsl.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=ADSL Deamon
+Description=ADSL Daemon
 
 [Service]
 Type=forking
diff --git a/libre/rp-pppoe-libre/kmode.patch b/libre/rp-pppoe/kmode.patch
index 37eef58f7..37eef58f7 100644
--- a/libre/rp-pppoe-libre/kmode.patch
+++ b/libre/rp-pppoe/kmode.patch
diff --git a/libre/rp-pppoe-libre/rp-pppoe-libre.patch b/libre/rp-pppoe/libre.patch
index 9cf16d7d7..9cf16d7d7 100644
--- a/libre/rp-pppoe-libre/rp-pppoe-libre.patch
+++ b/libre/rp-pppoe/libre.patch
diff --git a/libre/rp-pppoe-libre/rp-pppoe.install b/libre/rp-pppoe/rp-pppoe.install
index 1d4bccce2..1d4bccce2 100644
--- a/libre/rp-pppoe-libre/rp-pppoe.install
+++ b/libre/rp-pppoe/rp-pppoe.install