[arch-commits] Commit in rp-pppoe/trunk (PKGBUILD rp-pppoe.install)

[Daniel Isenmann]

    Date: Wednesday, January 6, 2010 @ 07:47:08
  Author: daniel
Revision: 62272

upgpkg: rp-pppoe 3.10-2
    Fix FS#13876. Moved .so file to the right place

Added:
  rp-pppoe/trunk/rp-pppoe.install
Modified:
  rp-pppoe/trunk/PKGBUILD

------------------+
 PKGBUILD         |   12 +++++++++++-
 rp-pppoe.install |   12 ++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-01-06 12:44:59 UTC (rev 62271)
+++ PKGBUILD	2010-01-06 12:47:08 UTC (rev 62272)
@@ -3,7 +3,7 @@
 # Maintainer: judd <jvinet at zeroflux.org>
 pkgname=rp-pppoe
 pkgver=3.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client"
 arch=(i686 x86_64)
 url="http://www.roaringpenguin.com/pppoe/"
@@ -13,6 +13,7 @@
 options=('!makeflags')
 backup=(etc/ppp/pppoe.conf etc/ppp/firewall-standalone etc/ppp/firewall-masq etc/ppp/pppoe-server-options)
 source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz adsl)
+install=rp-pppoe.install
 md5sums=('d58a13cc4185bca6121a606ff456dec0'
          'adace1ad441aa88dcb3db52fb7f9c97f')
 
@@ -21,5 +22,14 @@
   ./configure --prefix=/usr --enable-plugin=/ppp-2.4.4
   make || return 1
   make DESTDIR=$startdir/pkg install
+  
+  #moving .so files to /usr/lib according to FS#13876
+  mkdir -p ${pkgdir}/usr/lib/rp-pppoe
+  mv ${pkgdir}/etc/ppp/plugins/rp-pppoe.so ${pkgdir}/usr/lib/rp-pppoe/
+  #not necessary after moving the plugin
+  rm -rf ${pkgdir}/etc/ppp/plugins
+  #changing config to the new path
+  sed -i 's/LINUX_PLUGIN=/LINUX_PLUGIN=\/usr\/lib\/rp-pppoe\/rp-pppoe.so/g' ${pkgdir}/etc/ppp/pppoe.conf
+  
   install -m755 -D ../../adsl $startdir/pkg/etc/rc.d/adsl
 }

Added: rp-pppoe.install
===================================================================
--- rp-pppoe.install	                        (rev 0)
+++ rp-pppoe.install	2010-01-06 12:47:08 UTC (rev 62272)
@@ -0,0 +1,12 @@
+#arg 1:  the new package version
+post_install() {
+echo ">>> The kernel-mode plugin has a new place."
+echo ">>> It's now located under /usr/lib/rp-pppoe/rp-pppoe.so"
+echo ">>> Change LINUX_PLUGIN to the new path in your /etc/ppp/pppoe.conf"
+}
+
+# arg 1:  the new package version
+# arg 2:  the old package version
+post_upgrade() {
+  post_install $1
+}