packages: ntrack/ntrack.spec, ntrack/ntrack-link.patch (NEW) - rel 2; fix m...

arekm arekm at pld-linux.org
Mon Apr 4 20:05:33 CEST 2011


Author: arekm                        Date: Mon Apr  4 18:05:33 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; fix modules linking

---- Files affected:
packages/ntrack:
   ntrack.spec (1.8 -> 1.9) , ntrack-link.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/ntrack/ntrack.spec
diff -u packages/ntrack/ntrack.spec:1.8 packages/ntrack/ntrack.spec:1.9
--- packages/ntrack/ntrack.spec:1.8	Mon Apr  4 19:13:26 2011
+++ packages/ntrack/ntrack.spec	Mon Apr  4 20:05:28 2011
@@ -6,11 +6,12 @@
 Summary(pl.UTF-8):	Program
 Name:		ntrack
 Version:	0.14
-Release:	1
+Release:	2
 License:	GPL v3/LGPL v3
 Group:		Development/Libraries
 Source0:	http://launchpad.net/ntrack/main/014/+download/%{name}-%{_realver}.tar.gz
 # Source0-md5:	d8af7c0f77c030d089bfa5ce0dd1057b
+Patch0:		%{name}-link.patch
 URL:		http://launchpad.net/ntrack
 BuildRequires:	QtCore-devel
 BuildRequires:	autoconf
@@ -82,6 +83,7 @@
 
 %prep
 %setup -q -n %{name}-%{_realver}
+%patch0 -p1
 
 %build
 %configure
@@ -151,6 +153,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2011/04/04 18:05:28  arekm
+- rel 2; fix modules linking
+
 Revision 1.8  2011/04/04 17:13:26  arekm
 - up to 0.14; patches merged; python-ntrack subpackage
 

================================================================
Index: packages/ntrack/ntrack-link.patch
diff -u /dev/null packages/ntrack/ntrack-link.patch:1.1
--- /dev/null	Mon Apr  4 20:05:33 2011
+++ packages/ntrack/ntrack-link.patch	Mon Apr  4 20:05:28 2011
@@ -0,0 +1,27 @@
+--- ntrack-014/modules/Makefile.am~	2011-04-03 23:14:35.000000000 +0200
++++ ntrack-014/modules/Makefile.am	2011-04-04 20:03:42.835840583 +0200
+@@ -54,21 +54,21 @@
+ 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) $(top_builddir)/common/libntrack.la
+ 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) $(top_builddir)/common/libntrack.la
+ 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) $(top_builddir)/common/libntrack.la
+ ntrack_libnl3_la_LDFLAGS = $(ntrack_libnl_ldflags)
+ endif
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ntrack/ntrack.spec?r1=1.8&r2=1.9&f=u



More information about the pld-cvs-commit mailing list