packages: ntrack/ntrack.spec, ntrack/ntrack-link.patch (REMOVED), ntrack/nt...

arekm arekm at pld-linux.org
Sat Nov 12 14:45:18 CET 2011


Author: arekm                        Date: Sat Nov 12 13:45:17 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.15; needs patched libnl; patches dropped (not needed anymore)

---- Files affected:
packages/ntrack:
   ntrack.spec (1.12 -> 1.13) , ntrack-link.patch (1.2 -> NONE)  (REMOVED), ntrack-lp-755608.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/ntrack/ntrack.spec
diff -u packages/ntrack/ntrack.spec:1.12 packages/ntrack/ntrack.spec:1.13
--- packages/ntrack/ntrack.spec:1.12	Sat Sep 17 09:06:34 2011
+++ packages/ntrack/ntrack.spec	Sat Nov 12 14:45:12 2011
@@ -1,29 +1,30 @@
 # $Revision$, $Date$
 #
+%bcond_without	tests
+#
 %define		_realver	%(echo %{version} | tr -d .)
 
 Summary:	Program
 Summary(pl.UTF-8):	Program
 Name:		ntrack
-Version:	0.14
-Release:	5
+Version:	0.15
+Release:	1
 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
-Patch1:		%{name}-lp-755608.patch
+Source0:	http://launchpad.net/ntrack/main/015/+download/%{name}-%{_realver}.tar.gz
+# Source0-md5:	67d8f49538fb3927303e57f35e85dc9e
 URL:		http://launchpad.net/ntrack
 BuildRequires:	QtCore-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	libnl-devel >= 1:3.2
+BuildRequires:	libnl-devel >= 1:3.2.3
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
 BuildRequires:	python-pygobject-devel
 BuildRequires:	qt4-build
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.600
+Requires:	libnl >= 1:3.2.3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -84,8 +85,6 @@
 
 %prep
 %setup -q -n %{name}-%{_realver}
-%patch0 -p1
-%patch1 -p0
 
 %build
 %{__libtoolize}
@@ -97,6 +96,8 @@
 
 %{__make}
 
+%{?with_tests:%{__make} -j1 check}
+
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make} -j1 install \
@@ -120,7 +121,7 @@
 %attr(755,root,root) %{_libdir}/libntrack.so.*.*.*
 %dir %{_libdir}/ntrack
 %dir %{_libdir}/ntrack/modules
-%attr(755,root,root) %{_libdir}/ntrack/modules/ntrack-libnl3.so
+%attr(755,root,root) %{_libdir}/ntrack/modules/ntrack-libnl3_x.so
 
 %files qt4
 %defattr(644,root,root,755)
@@ -150,7 +151,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-libnl3.a
+%attr(755,root,root) %{_libdir}/ntrack/modules/ntrack-libnl3_x.a
 %attr(755,root,root) %{_libdir}/python2.7/site-packages/pyntrack.a
 
 
@@ -160,6 +161,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2011/11/12 13:45:12  arekm
+- up to 0.15; needs patched libnl; patches dropped (not needed anymore)
+
 Revision 1.12  2011/09/17 07:06:34  arekm
 - rel 5; build with libnl 3.2
 
================================================================

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



More information about the pld-cvs-commit mailing list