[packages/ntrack] - revert invalid fix

arekm arekm at pld-linux.org
Mon Feb 4 19:11:05 CET 2013


commit 29a731066867d9b2a9739c05d0165e86f499847b
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon Feb 4 19:11:02 2013 +0100

    - revert invalid fix

 ntrack-libnl.patch | 11 -----------
 ntrack.spec        |  4 +---
 2 files changed, 1 insertion(+), 14 deletions(-)
---
diff --git a/ntrack.spec b/ntrack.spec
index 21bbf9b..e09b8e5 100644
--- a/ntrack.spec
+++ b/ntrack.spec
@@ -7,13 +7,12 @@ Summary:	Network status tracking made easy for desktop applications
 Summary(pl.UTF-8):	Łatwe śledzenie stanu sieci dla aplikacji użytkowych
 Name:		ntrack
 Version:	0.16
-Release:	4
+Release:	4.1
 License:	LGPL v3+
 Group:		Libraries
 Source0:	http://launchpad.net/ntrack/main/016/+download/%{name}-%{file_ver}.tar.gz
 # Source0-md5:	21691dac43460a6791cba3decbc68242
 Patch0:		%{name}-am.patch
-Patch1:		%{name}-libnl.patch
 URL:		http://launchpad.net/ntrack
 BuildRequires:	QtCore-devel >= 4
 BuildRequires:	autoconf >= 2.50
@@ -156,7 +155,6 @@ Wiązania Pythona do biblioteki ntrack.
 %prep
 %setup -q -n %{name}-%{file_ver}
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__libtoolize}
diff --git a/ntrack-libnl.patch b/ntrack-libnl.patch
deleted file mode 100644
index 1ea3602..0000000
--- a/ntrack-libnl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ntrack-016/modules/ntrack-libnl.c~	2011-10-21 22:46:13.000000000 +0200
-+++ ntrack-016/modules/ntrack-libnl.c	2013-02-03 23:27:15.709275551 +0100
-@@ -530,7 +530,7 @@
- 		op_default_route_disappeared ((struct _ntrack_monitor_arch*) self, nl_info);
- 	} else if (nl_info->topmost_route && topmost_route) {
- 		int diff_bits;
--		if ((diff_bits = (route_obj_ops.oo_id_attrs | ROUTE_ATTR_OIF
-+		if ((diff_bits = (nl_object_get_id_attrs((struct nl_object *)&route_obj_ops) | ROUTE_ATTR_OIF
- 		                  | ROUTE_ATTR_GATEWAY) &
- 		                  nl_object_diff (OBJ_CAST (nl_info->topmost_route),
- 		                                  OBJ_CAST (topmost_route)))) {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ntrack.git/commitdiff/29a731066867d9b2a9739c05d0165e86f499847b



More information about the pld-cvs-commit mailing list