packages: ntrack/ntrack-h2def.patch, ntrack/ntrack.spec, ntrack/ntrack-libn...

arekm arekm at pld-linux.org
Sun Mar 27 23:34:28 CEST 2011 

Author: arekm                        Date: Sun Mar 27 21:34:28 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.13 and port to libnl 3.0

---- Files affected:
packages/ntrack:
   ntrack-h2def.patch (1.1 -> 1.2) , ntrack.spec (1.5 -> 1.6) , ntrack-libnl.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/ntrack/ntrack-h2def.patch
diff -u packages/ntrack/ntrack-h2def.patch:1.1 packages/ntrack/ntrack-h2def.patch:1.2
--- packages/ntrack/ntrack-h2def.patch:1.1	Fri Jan 21 18:17:57 2011
+++ packages/ntrack/ntrack-h2def.patch	Sun Mar 27 23:34:23 2011
@@ -1,13 +1,13 @@
---- configure.ac.orig	2011-01-21 17:53:50.195298265 +0100
-+++ configure.ac	2011-01-21 17:53:59.381912529 +0100
-@@ -110,8 +110,8 @@
-            AC_SUBST(PYGOBJECT_CFLAGS)
-            AC_SUBST(PYGOBJECT_LIBS)])
- 
--  if test -x /usr/share/pygobject/2.0/codegen/h2def.py; then
--    H2DEF=/usr/share/pygobject/2.0/codegen/h2def.py
-+  if test -f /usr/share/pygobject/2.0/codegen/h2def.pyc; then
-+    H2DEF=/usr/share/pygobject/2.0/codegen/h2def.pyc
+diff -urN ntrack-013.org/configure.ac ntrack-013/configure.ac
+--- ntrack-013.org/configure.ac	2011-03-27 19:59:12.000000000 +0200
++++ ntrack-013/configure.ac	2011-03-27 23:22:15.663309599 +0200
+@@ -115,6 +115,9 @@
+   if test -x /usr/share/pygobject/2.0/codegen/h2def.py; then
+     H2DEF=/usr/share/pygobject/2.0/codegen/h2def.py
      PYG_CODEGEN=pygobject-codegen-2.0
++  elif test -f /usr/share/pygobject/2.0/codegen/h2def.pyc; then
++    H2DEF=/usr/share/pygobject/2.0/codegen/h2def.pyc
++    PYG_CODEGEN=pygobject-codegen-2.0
    elif test -x /usr/share/pygtk/2.0/codegen/h2def.py; then
      H2DEF=/usr/share/pygtk/2.0/codegen/h2def.py
+     PYG_CODEGEN=pygtk-codegen-2.0

================================================================
Index: packages/ntrack/ntrack.spec
diff -u packages/ntrack/ntrack.spec:1.5 packages/ntrack/ntrack.spec:1.6
--- packages/ntrack/ntrack.spec:1.5	Sun Mar 27 23:07:00 2011
+++ packages/ntrack/ntrack.spec	Sun Mar 27 23:34:23 2011
@@ -5,18 +5,19 @@
 Summary:	Program
 Summary(pl.UTF-8):	Program
 Name:		ntrack
-Version:	0.11
-Release:	2
+Version:	0.13
+Release:	1
 License:	GPL v3/LGPL v3
 Group:		Development/Libraries
-Source0:	http://launchpad.net/ntrack/main/011/+download/%{name}-%{_realver}.tar.gz
-# Source0-md5:	7ae0437e0865f1ec313b1436d4d75a43
+Source0:	http://launchpad.net/ntrack/main/013/+download/%{name}-%{_realver}.tar.gz
+# Source0-md5:	90596b924a108f8b4eea52239ba64369
 URL:		http://launchpad.net/ntrack
 Patch0:		%{name}-h2def.patch
+Patch1:		%{name}-libnl.patch
 BuildRequires:	QtCore-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	libnl-devel
+BuildRequires:	libnl-devel >= 1:3.0
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
 BuildRequires:	python-pygobject-devel
@@ -71,7 +72,8 @@
 
 %prep
 %setup -q -n %{name}-%{_realver}
-%patch0 -p0
+%patch0 -p1
+%patch1 -p1
 
 %build
 %{__aclocal} -I m4
@@ -104,7 +106,7 @@
 %attr(755,root,root) %{_libdir}/libntrack.so.*.*.*
 %dir %{_libdir}/ntrack
 %dir %{_libdir}/ntrack/modules
-%attr(755,root,root) %{_libdir}/ntrack/modules/ntrack-libnl1.so
+%attr(755,root,root) %{_libdir}/ntrack/modules/ntrack-libnl3.so
 %attr(755,root,root) %{_libdir}/python2.7/site-packages/pyntrack.so
 
 %files qt4
@@ -131,7 +133,7 @@
 %attr(755,root,root) %{_libdir}/libntrack-gobject.a
 %attr(755,root,root) %{_libdir}/libntrack-qt4.a
 %attr(755,root,root) %{_libdir}/libntrack.a
-%attr(755,root,root) %{_libdir}/ntrack/modules/ntrack-libnl1.a
+%attr(755,root,root) %{_libdir}/ntrack/modules/ntrack-libnl3.a
 %attr(755,root,root) %{_libdir}/python2.7/site-packages/pyntrack.a
 
 
@@ -141,6 +143,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2011/03/27 21:34:23  arekm
+- up to 0.13 and port to libnl 3.0
+
 Revision 1.5  2011/03/27 21:07:00  arekm
 - release 2
 

================================================================
Index: packages/ntrack/ntrack-libnl.patch
diff -u /dev/null packages/ntrack/ntrack-libnl.patch:1.1
--- /dev/null	Sun Mar 27 23:34:28 2011
+++ packages/ntrack/ntrack-libnl.patch	Sun Mar 27 23:34:23 2011
@@ -0,0 +1,51 @@
+--- ntrack-013.org/configure.ac	2011-03-27 19:59:12.000000000 +0200
++++ ntrack-013/configure.ac	2011-03-27 23:25:44.112838906 +0200
+@@ -139,6 +142,11 @@
+ 
+ AM_CONDITIONAL(HAVE_QT4, test $ac_have_qt4 = 1)
+ 
++PKG_CHECK_MODULES(LIBNL3, libnl-3.0, ac_have_libnl3=1, ac_have_libnl3=0)
++AC_SUBST(LIBNL3_CFLAGS)
++AC_SUBST(LIBNL3_LIBS)
++AM_CONDITIONAL(HAVE_LIBNL3, test $ac_have_libnl3 = 1)
++
+ PKG_CHECK_MODULES(LIBNL2, libnl-2.0, ac_have_libnl2=1, ac_have_libnl2=0)
+ AC_SUBST(LIBNL2_CFLAGS)
+ AC_SUBST(LIBNL2_LIBS)
+@@ -150,7 +158,7 @@
+ AM_CONDITIONAL(HAVE_LIBNL1, test $ac_have_libnl1 = 1)
+ 
+ # consistency checks
+-if ! test "$ac_have_libnl1" = "1" -o "$ac_have_libnl2" = 1; then
++if ! test "$ac_have_libnl1" = "1" -o "$ac_have_libnl2" = 1 -o "$ac_have_libnl3" = 1; then
+ 	AC_ERROR([libnl is required])
+ fi
+ 
+--- ntrack-013/modules/Makefile.am~	2010-12-22 23:47:45.000000000 +0100
++++ ntrack-013/modules/Makefile.am	2011-03-27 23:28:09.316142639 +0200
+@@ -36,8 +36,11 @@
+ if HAVE_LIBNL2
+ NTRACK_LIB2 = ntrack-libnl2.la
+ endif
++if HAVE_LIBNL3
++NTRACK_LIB3 = ntrack-libnl3.la
++endif
+ 
+-ntrackmodules_LTLIBRARIES = $(NTRACK_LIB1) $(NTRACK_LIB2)
++ntrackmodules_LTLIBRARIES = $(NTRACK_LIB1) $(NTRACK_LIB2) $(NTRACK_LIB3)
+ 
+ if HAVE_LIBNL1
+ ntrack_libnl1_la_SOURCES = \
+@@ -57,3 +60,12 @@
+ ntrack_libnl2_la_LDFLAGS = -module -avoid-version
+ endif
+ 
++if HAVE_LIBNL3
++ntrack_libnl3_la_SOURCES = \
++	ntrack-libnl.c \
++	$(top_srcdir)/common/ntrackarchapi.h
++ntrack_libnl3_la_CFLAGS = $(AM_CFLAGS) $(LIBNL3_CFLAGS) -DHAVE_LIBNL2 -DHAVE_LIBNL3
++ntrack_libnl3_la_LIBADD = $(LIBNL3_LIBS) ../common/libntrack.la
++ntrack_libnl3_la_LDFLAGS = -module -avoid-version
++endif
++
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ntrack/ntrack-h2def.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ntrack/ntrack.spec?r1=1.5&r2=1.6&f=u

More information about the pld-cvs-commit mailing list