[arch-commits] Commit in lxpanel/trunk (3 files)

[Bartłomiej Piotrowski]

    Date: Wednesday, July 10, 2013 @ 09:14:19
  Author: bpiotrowski
Revision: 93769

upgpkg: lxpanel 0.5.12-2

- rebuild against menu-cache 0.5.0

Added:
  lxpanel/trunk/lxpanel-0.5.12-automake-1.14-support.patch
    (from rev 93764, lxpanel/trunk/lxpanel-0.5.12-automake-1.13-support.patch)
Modified:
  lxpanel/trunk/PKGBUILD
Deleted:
  lxpanel/trunk/lxpanel-0.5.12-automake-1.13-support.patch

--------------------------------------------+
 PKGBUILD                                   |   20 +++++++++++---------
 lxpanel-0.5.12-automake-1.13-support.patch |   15 ---------------
 lxpanel-0.5.12-automake-1.14-support.patch |   15 +++++++++++++++
 3 files changed, 26 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-10 07:02:47 UTC (rev 93768)
+++ PKGBUILD	2013-07-10 07:14:19 UTC (rev 93769)
@@ -5,7 +5,7 @@
 
 pkgname=lxpanel
 pkgver=0.5.12
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight X11 desktop panel for LXDE'
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -15,16 +15,18 @@
 makedepends=('docbook-xml' 'docbook-xsl' 'wireless_tools')
 optdepends=('wireless_tools: netstat plugin')
 source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz
-        lxpanel-0.5.12-automake-1.13-support.patch)
+        lxpanel-0.5.12-automake-1.14-support.patch)
 sha256sums=('c29997c522f138e4beb02fc549c84136fc840a836c1f69b400d90d2d4e91de1b'
-            'a35c786e3cd2977c5cf018e126c7f309b7fc4c15f9b821895e1f6fe25125f68f')
+            'ce5bf608374188da00ce3f0a1c74d1ddebd160555db4119eebd85f64731fe1d1')
 
-build() {
-  cd $srcdir/$pkgname-$pkgver
- 
-  patch -Np0 -i $srcdir/lxpanel-0.5.12-automake-1.13-support.patch 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np0 -i ../lxpanel-0.5.12-automake-1.14-support.patch
   ./autogen.sh
+}
 
+build() {
+  cd $pkgname-$pkgver
   CFLAGS+=' -lgmodule-2.0' ./configure \
     --sysconfdir=/etc \
     --prefix=/usr \
@@ -33,6 +35,6 @@
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }

Deleted: lxpanel-0.5.12-automake-1.13-support.patch
===================================================================
--- lxpanel-0.5.12-automake-1.13-support.patch	2013-07-10 07:02:47 UTC (rev 93768)
+++ lxpanel-0.5.12-automake-1.13-support.patch	2013-07-10 07:14:19 UTC (rev 93769)
@@ -1,15 +0,0 @@
---- autogen.sh.orig	2013-01-27 10:38:55.000000000 +0100
-+++ autogen.sh	2013-01-27 10:59:56.897030226 +0100
-@@ -6,9 +6,10 @@
- 
- if [ "$AM_INSTALLED_VERSION" != "1.10" \
-     -a "$AM_INSTALLED_VERSION" != "1.11" \
--    -a "$AM_INSTALLED_VERSION" != "1.12" ];then
-+    -a "$AM_INSTALLED_VERSION" != "1.12" \
-+	-a "$AM_INSTALLED_VERSION" != "1.13" ];then
- 	echo
--	echo "You must have automake 1.10, 1.11, or 1.12 installed to compile lxpanel."
-+	echo "You must have automake >=1.10 installed to compile lxpanel."
- 	echo "Install the appropriate package for your distribution,"
- 	echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
- 	exit 1

Copied: lxpanel/trunk/lxpanel-0.5.12-automake-1.14-support.patch (from rev 93764, lxpanel/trunk/lxpanel-0.5.12-automake-1.13-support.patch)
===================================================================
--- lxpanel-0.5.12-automake-1.14-support.patch	                        (rev 0)
+++ lxpanel-0.5.12-automake-1.14-support.patch	2013-07-10 07:14:19 UTC (rev 93769)
@@ -0,0 +1,15 @@
+--- autogen.sh.orig	2013-01-27 10:38:55.000000000 +0100
++++ autogen.sh	2013-01-27 10:59:56.897030226 +0100
+@@ -6,9 +6,10 @@
+ 
+ if [ "$AM_INSTALLED_VERSION" != "1.10" \
+     -a "$AM_INSTALLED_VERSION" != "1.11" \
+-    -a "$AM_INSTALLED_VERSION" != "1.12" ];then
++    -a "$AM_INSTALLED_VERSION" != "1.12" \
++	-a "$AM_INSTALLED_VERSION" != "1.14" ];then
+ 	echo
+-	echo "You must have automake 1.10, 1.11, or 1.12 installed to compile lxpanel."
++	echo "You must have automake >=1.10 installed to compile lxpanel."
+ 	echo "Install the appropriate package for your distribution,"
+ 	echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
+ 	exit 1