[arch-commits] Commit in ntrack/trunk (PKGBUILD)

2012-02-21 Thread Andrea Scarpino
Date: Tuesday, February 21, 2012 @ 06:02:07
  Author: andrea
Revision: 150727

Use python2 when python3 is installed (FS#28559)

Modified:
  ntrack/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-21 10:52:32 UTC (rev 150726)
+++ PKGBUILD2012-02-21 11:02:07 UTC (rev 150727)
@@ -21,7 +21,7 @@
   cd ${srcdir}/${pkgname}-0${pkgver}
   patch -p1 -i ${srcdir}/libnl3.patch
 
-  ./configure --prefix=/usr \
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
 --sysconfdir=/etc \
 --localstatedir=/var
   make



[arch-commits] Commit in ntrack/trunk (PKGBUILD libnl3.patch)

2012-02-09 Thread Andrea Scarpino
Date: Thursday, February 9, 2012 @ 14:29:57
  Author: andrea
Revision: 149724

upgpkg: ntrack 1:16-2

libnl rebuild

Added:
  ntrack/trunk/libnl3.patch
Modified:
  ntrack/trunk/PKGBUILD

--+
 PKGBUILD |9 +++--
 libnl3.patch |   99 +
 2 files changed, 105 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-09 19:22:22 UTC (rev 149723)
+++ PKGBUILD2012-02-09 19:29:57 UTC (rev 149724)
@@ -3,7 +3,7 @@
 
 pkgname=ntrack
 pkgver=16
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc=A network connectivity tracking library
 arch=('i686' 'x86_64')
@@ -12,11 +12,14 @@
 depends=('qt' 'libnl')
 makedepends=('python2')
 options=('!libtool' '!emptydirs')
-source=(http://launchpad.net/${pkgname}/main/0${pkgver}/+download/${pkgname}-0${pkgver}.tar.gz;)
-md5sums=('21691dac43460a6791cba3decbc68242')
+source=(http://launchpad.net/${pkgname}/main/0${pkgver}/+download/${pkgname}-0${pkgver}.tar.gz;
+'libnl3.patch')
+md5sums=('21691dac43460a6791cba3decbc68242'
+ '0a1f6b7f9a01c323e81d6da95cad93cd')
 
 build() {
   cd ${srcdir}/${pkgname}-0${pkgver}
+  patch -p1 -i ${srcdir}/libnl3.patch
 
   ./configure --prefix=/usr \
 --sysconfdir=/etc \

Added: libnl3.patch
===
--- libnl3.patch(rev 0)
+++ libnl3.patch2012-02-09 19:29:57 UTC (rev 149724)
@@ -0,0 +1,99 @@
+From: Mathieu Trudel-Lapierre mathieu.trudel-lapie...@canonical.com
+Subject: Disable -pedantic, it makes ntrack fail to build against libnl3 3.2 
and glib.
+
+Index: ntrack/glib/Makefile.am
+===
+--- ntrack.orig/glib/Makefile.am   2011-12-22 19:25:13.13747 -0500
 ntrack/glib/Makefile.am2011-12-22 20:07:10.243344976 -0500
+@@ -26,7 +26,6 @@
+ AM_CFLAGS = \
+   -Wall \
+   -Werror \
+-  -pedantic \
+   -I$(srcdir)/../common/
+ 
+ AM_LDFLAGS =
+Index: ntrack/glib/Makefile.in
+===
+--- ntrack.orig/glib/Makefile.in   2011-12-22 20:05:46.243208000 -0500
 ntrack/glib/Makefile.in2011-12-22 20:07:14.871344769 -0500
+@@ -325,7 +325,6 @@
+ AM_CFLAGS = \
+   -Wall \
+   -Werror \
+-  -pedantic \
+   -I$(srcdir)/../common/
+ 
+ AM_LDFLAGS = 
+Index: ntrack/glib/test/Makefile.am
+===
+--- ntrack.orig/glib/test/Makefile.am  2011-12-22 19:25:13.13747 -0500
 ntrack/glib/test/Makefile.am   2011-12-22 20:07:19.451344565 -0500
+@@ -27,7 +27,6 @@
+   ../../common/libntrack.la
+ 
+ AM_CFLAGS = \
+-  -pedantic \
+   -Wall \
+   -Werror \
+   -I$(srcdir)/.. \
+Index: ntrack/glib/test/Makefile.in
+===
+--- ntrack.orig/glib/test/Makefile.in  2011-12-22 20:05:46.243208000 -0500
 ntrack/glib/test/Makefile.in   2011-12-22 20:07:23.903344367 -0500
+@@ -260,7 +260,6 @@
+   ../../common/libntrack.la
+ 
+ AM_CFLAGS = \
+-  -pedantic \
+   -Wall \
+   -Werror \
+   -I$(srcdir)/.. \
+Index: ntrack/gobject/Makefile.am
+===
+--- ntrack.orig/gobject/Makefile.am2011-12-22 20:05:46.243208000 -0500
 ntrack/gobject/Makefile.am 2011-12-22 20:07:27.515344206 -0500
+@@ -26,7 +26,6 @@
+ AM_CFLAGS = \
+   -Wall \
+   -Werror \
+-  -pedantic \
+   -I$(srcdir)/../common/ \
+   -I$(srcdir)/../glib/
+ 
+Index: ntrack/gobject/Makefile.in
+===
+--- ntrack.orig/gobject/Makefile.in2011-12-22 20:05:46.243208000 -0500
 ntrack/gobject/Makefile.in 2011-12-22 20:07:31.519344028 -0500
+@@ -347,7 +347,6 @@
+ AM_CFLAGS = \
+   -Wall \
+   -Werror \
+-  -pedantic \
+   -I$(srcdir)/../common/ \
+   -I$(srcdir)/../glib/
+ 
+Index: ntrack/modules/Makefile.am
+===
+--- ntrack.orig/modules/Makefile.am2011-12-22 20:05:46.243208000 -0500
 ntrack/modules/Makefile.am 2011-12-22 20:07:35.519343851 -0500
+@@ -26,7 +26,6 @@
+   -Wall \
+   -Werror \
+   -Wno-variadic-macros \
+-  -pedantic \
+   -I$(top_srcdir)/common/
+ 
+ AM_LDFLAGS =
+Index: ntrack/modules/Makefile.in
+===
+--- ntrack.orig/modules/Makefile.in2011-12-22 20:05:46.243208000 -0500
 ntrack/modules/Makefile.in 2011-12-22 20:07:39.391343676 -0500
+@@ -352,7 +352,6 @@
+   -Wall \
+   -Werror \
+   -Wno-variadic-macros \
+-  -pedantic \
+   -I$(top_srcdir)/common/
+ 
+ AM_LDFLAGS = 



[arch-commits] Commit in ntrack/trunk (PKGBUILD ntrack_libnl_link.diff)

2011-09-12 Thread Florian Pritz
Date: Monday, September 12, 2011 @ 16:46:12
  Author: bluewind
Revision: 137939

upstream update; new patch; libnl3.1 fix

Added:
  ntrack/trunk/ntrack_libnl_link.diff
Modified:
  ntrack/trunk/PKGBUILD

+
 PKGBUILD   |   13 -
 ntrack_libnl_link.diff |   34 ++
 2 files changed, 42 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-12 20:44:01 UTC (rev 137938)
+++ PKGBUILD2011-09-12 20:46:12 UTC (rev 137939)
@@ -2,8 +2,8 @@
 # Maintainer: Andrea Scarpino and...@archlinux.org
 
 pkgname=ntrack
-pkgver=13
-pkgrel=2
+pkgver=14
+pkgrel=1
 epoch=1
 pkgdesc=A network connectivity tracking library
 arch=('i686' 'x86_64')
@@ -12,9 +12,10 @@
 depends=('qt' 'libnl' 'gcc-libs')
 makedepends=('python2')
 
source=(http://launchpad.net/${pkgname}/main/0${pkgver}/+download/${pkgname}-0${pkgver}.tar.gz;
-'dead-loop-fix.patch')
-md5sums=('90596b924a108f8b4eea52239ba64369'
- '02bda6ae15ef04b6a7d9273c37752681')
+'dead-loop-fix.patch' ntrack_libnl_link.diff)
+md5sums=('d8af7c0f77c030d089bfa5ce0dd1057b'
+ '02bda6ae15ef04b6a7d9273c37752681'
+ 'f5a0fbdb1f1a5e6355119dfc0d9c555b')
 options=('!libtool' '!emptydirs')
 
 build() {
@@ -22,6 +23,8 @@
 
   patch -p0 -i ${srcdir}/dead-loop-fix.patch
 
+  sed -i 's/libnl-3.0/libnl-3.1/g' configure
+
   ./configure --prefix=/usr \
 --sysconfdir=/etc \
 --localstatedir=/var

Added: ntrack_libnl_link.diff
===
--- ntrack_libnl_link.diff  (rev 0)
+++ ntrack_libnl_link.diff  2011-09-12 20:46:12 UTC (rev 137939)
@@ -0,0 +1,34 @@
+upstream bug https://bugs.launchpad.net/ubuntu/+source/ntrack/+bug/750554
+--- ntrack-014+bzr312.orig/modules/Makefile.am
 ntrack-014+bzr312/modules/Makefile.am
+@@ -49,26 +49,27 @@
+   ntrack-libnl.c \
+   $(top_srcdir)/common/ntrackarchapi.h
+ ntrack_libnl_cflags = $(AM_CFLAGS) $(LIBNL_DEF)
++ntrack_libnl_libadd = ../common/libntrack.la
+ ntrack_libnl_ldflags = -module -avoid-version
+ 
+ if HAVE_LIBNL1
+ ntrack_libnl1_la_SOURCES = $(ntrack_libnl_sources)
+ ntrack_libnl1_la_CFLAGS = $(LIBNL1_CFLAGS) $(ntrack_libnl_cflags)
+-ntrack_libnl1_la_LIBADD = $(LIBNL1_LIBS)
++ntrack_libnl1_la_LIBADD = $(LIBNL1_LIBS) $(ntrack_libnl_libadd)
+ ntrack_libnl1_la_LDFLAGS = $(ntrack_libnl_ldflags)
+ endif
+ 
+ if HAVE_LIBNL2
+ ntrack_libnl2_la_SOURCES = $(ntrack_libnl_sources)
+ ntrack_libnl2_la_CFLAGS = $(LIBNL2_CFLAGS) $(ntrack_libnl_cflags)
+-ntrack_libnl2_la_LIBADD = $(LIBNL2_LIBS)
++ntrack_libnl2_la_LIBADD = $(LIBNL2_LIBS) $(ntrack_libnl_libadd)
+ ntrack_libnl2_la_LDFLAGS = $(ntrack_libnl_ldflags)
+ endif
+ 
+ if HAVE_LIBNL3
+ ntrack_libnl3_la_SOURCES = $(ntrack_libnl_sources)
+ ntrack_libnl3_la_CFLAGS = $(LIBNL3_CFLAGS) $(ntrack_libnl_cflags)
+-ntrack_libnl3_la_LIBADD = $(LIBNL3_LIBS)
++ntrack_libnl3_la_LIBADD = $(LIBNL3_LIBS) $(ntrack_libnl_libadd)
+ ntrack_libnl3_la_LDFLAGS = $(ntrack_libnl_ldflags)
+ endif
+ 



[arch-commits] Commit in ntrack/trunk (PKGBUILD)

2011-04-06 Thread Andrea Scarpino
Date: Wednesday, April 6, 2011 @ 04:24:14
  Author: andrea
Revision: 118249

upgpkg: ntrack 14-1
upstream release

Modified:
  ntrack/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-04-06 08:21:58 UTC (rev 118248)
+++ PKGBUILD2011-04-06 08:24:14 UTC (rev 118249)
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino and...@archlinux.org
 
 pkgname=ntrack
-pkgver=013
+pkgver=14
 pkgrel=1
 pkgdesc=A network connectivity tracking library
 arch=('i686' 'x86_64')
@@ -11,12 +11,12 @@
 depends=('qt' 'libnl' 'gcc-libs')
 makedepends=('python2')
 optdepends=('python2')
-source=(http://launchpad.net/${pkgname}/main/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz;)
-md5sums=('90596b924a108f8b4eea52239ba64369')
+source=(http://launchpad.net/${pkgname}/main/0${pkgver}/+download/${pkgname}-0${pkgver}.tar.gz;)
+md5sums=('d8af7c0f77c030d089bfa5ce0dd1057b')
 options=('!libtool')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}-0${pkgver}
   ./configure --prefix=/usr \
 --sysconfdir=/etc \
 --localstatedir=/var
@@ -24,6 +24,6 @@
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}-0${pkgver}
   make DESTDIR=${pkgdir} install
 }



[arch-commits] Commit in ntrack/trunk (PKGBUILD)

2011-04-06 Thread Andrea Scarpino
Date: Wednesday, April 6, 2011 @ 12:43:17
  Author: andrea
Revision: 118407

upgpkg: ntrack 13-1
downgrade to version 13 because 14 is bugged (see FS#23612)

Modified:
  ntrack/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-04-06 16:15:45 UTC (rev 118406)
+++ PKGBUILD2011-04-06 16:43:17 UTC (rev 118407)
@@ -2,8 +2,9 @@
 # Maintainer: Andrea Scarpino and...@archlinux.org
 
 pkgname=ntrack
-pkgver=14
+pkgver=13
 pkgrel=1
+epoch=1
 pkgdesc=A network connectivity tracking library
 arch=('i686' 'x86_64')
 url=http://launchpad.net/ntrack/;
@@ -12,7 +13,7 @@
 makedepends=('python2')
 optdepends=('python2')
 
source=(http://launchpad.net/${pkgname}/main/0${pkgver}/+download/${pkgname}-0${pkgver}.tar.gz;)
-md5sums=('d8af7c0f77c030d089bfa5ce0dd1057b')
+md5sums=('90596b924a108f8b4eea52239ba64369')
 options=('!libtool')
 
 build() {



[arch-commits] Commit in ntrack/trunk (PKGBUILD)

2011-03-27 Thread Andrea Scarpino
Date: Sunday, March 27, 2011 @ 15:11:16
  Author: andrea
Revision: 117025

upgpkg: ntrack 013-1
upstream release

Modified:
  ntrack/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-03-27 17:11:41 UTC (rev 117024)
+++ PKGBUILD2011-03-27 19:11:16 UTC (rev 117025)
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino and...@archlinux.org
 
 pkgname=ntrack
-pkgver=009
+pkgver=013
 pkgrel=1
 pkgdesc=A network connectivity tracking library
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@
 makedepends=('python2')
 optdepends=('python2')
 
source=(http://launchpad.net/${pkgname}/main/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz;)
-md5sums=('37e35967a03962f4d2d40ec0816250af')
+md5sums=('90596b924a108f8b4eea52239ba64369')
 options=('!libtool')
 
 build() {



[arch-commits] Commit in ntrack/trunk (PKGBUILD)

2011-01-26 Thread Andrea Scarpino
Date: Wednesday, January 26, 2011 @ 17:12:48
  Author: andrea
Revision: 107621

upgpkg: ntrack 009-1
new kdebase-runtime dependence

Added:
  ntrack/trunk/PKGBUILD

--+
 PKGBUILD |   29 +
 1 file changed, 29 insertions(+)

Added: PKGBUILD
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2011-01-26 22:12:48 UTC (rev 107621)
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Andrea Scarpino and...@archlinux.org
+
+pkgname=ntrack
+pkgver=009
+pkgrel=1
+pkgdesc=A network connectivity tracking library
+arch=('i686' 'x86_64')
+url=http://launchpad.net/ntrack/;
+license=('LGPL')
+depends=('qt' 'libnl' 'gcc-libs')
+makedepends=('python2')
+optdepends=('python2')
+source=(http://launchpad.net/${pkgname}/main/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz;)
+md5sums=('37e35967a03962f4d2d40ec0816250af')
+options=('!libtool')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr \
+--sysconfdir=/etc \
+--localstatedir=/var
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}


Property changes on: ntrack/trunk/PKGBUILD
___
Added: svn:keywords
   + Id