Hello community, here is the log from the commit of package ntrack for openSUSE:Factory checked in at 2013-08-24 10:15:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ntrack (Old) and /work/SRC/openSUSE:Factory/.ntrack.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ntrack" Changes: -------- --- /work/SRC/openSUSE:Factory/ntrack/ntrack.changes 2012-01-26 14:06:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ntrack.new/ntrack.changes 2013-08-24 10:15:01.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 23 15:14:03 UTC 2013 - [email protected] + +- Add libnl3-fix.patch: fixes compilation issue with recent libnl, + lp#1115449. + +------------------------------------------------------------------- New: ---- libnl3-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ntrack.spec ++++++ --- /var/tmp/diff_new_pack.tpGRUC/_old 2013-08-24 10:15:02.000000000 +0200 +++ /var/tmp/diff_new_pack.tpGRUC/_new 2013-08-24 10:15:02.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package ntrack # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,11 +30,15 @@ Url: https://launchpad.net/ntrack Source: http://launchpad.net/ntrack/main/%{version}/+download/ntrack-%{version}.tar.gz Patch1: fix-build.diff -%if %suse_version > 1210 +%if 0%{?suse_version} > 1230 +# PATCH-FIX-UPSTREAM -- Fix compilation issue with recent libnl -- lp#1115449 +Patch2: libnl3-fix.patch +%endif +%if 0%{?suse_version} > 1210 BuildRequires: libnl3-devel %define libnl_soname 3_x %else -%if %suse_version == 1210 +%if 0%{?suse_version} == 1210 # 12.1 has libnl3, but it lacks a critical fix. So go with 1.1 BuildRequires: libnl-1_1-devel %else @@ -42,12 +46,12 @@ %endif %define libnl_soname 1 %endif +BuildRequires: libtool +BuildRequires: python-devel BuildRequires: pkgconfig(QtCore) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(pygobject-2.0) -BuildRequires: python-devel -BuildRequires: libtool BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -87,8 +91,8 @@ %package -n lib%{name}-qt4-devel Summary: Network connectivity tracking library for desktop applications Group: Development/Libraries/C and C++ -Requires: lib%{name}-qt4-%{qt4_soname} = %{version} Requires: %{name}-devel = %{version} +Requires: lib%{name}-qt4-%{qt4_soname} = %{version} %description -n lib%{name}-qt4-devel ntrack aims to be a lightweight and easy to use library for application developers @@ -109,8 +113,8 @@ %package -n lib%{name}-glib-devel Summary: Network connectivity tracking library for desktop applications Group: Development/Libraries/C and C++ -Requires: lib%{name}-glib%{glib_soname} = %{version} Requires: %{name}-devel = %{version} +Requires: lib%{name}-glib%{glib_soname} = %{version} %description -n lib%{name}-glib-devel ntrack aims to be a lightweight and easy to use library for application developers @@ -118,7 +122,6 @@ Developments files for lib%{name}-glib%{glib_soname}. - %package -n lib%{name}-gobject%{gobject_soname} Summary: Network connectivity tracking library for desktop applications Group: System/Libraries @@ -132,8 +135,8 @@ %package -n lib%{name}-gobject-devel Summary: Network connectivity tracking library for desktop applications Group: Development/Libraries/C and C++ -Requires: lib%{name}-gobject%{gobject_soname} = %{version} Requires: %{name}-devel = %{version} +Requires: lib%{name}-gobject%{gobject_soname} = %{version} %description -n lib%{name}-gobject-devel ntrack aims to be a lightweight and easy to use library for application developers @@ -160,10 +163,12 @@ ntrack aims to be a lightweight and easy to use library for application developers that want to get events on network online status changes such as online, offline or route changes. - %prep %setup -q %patch1 +%if 0%{?suse_version} > 1230 +%patch2 +%endif autoreconf -fi %build @@ -181,9 +186,6 @@ rm -v %{buildroot}%{_libdir}/ntrack/modules/*.la rm -v %{buildroot}%{py_sitedir}/*.la -%clean -%{?buildroot:rm -rf %{buildroot}} - %post -n lib%{name}%{soname} -p /sbin/ldconfig %post -n lib%{name}-qt4-%{qt4_soname} -p /sbin/ldconfig @@ -203,70 +205,70 @@ %files -n lib%{name}%{soname} %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README -%_libdir/libntrack.so.%{soname}* +%{_libdir}/libntrack.so.%{soname}* %files devel %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README -%dir %_includedir/ntrack -%dir %_includedir/ntrack/common -%_includedir/ntrack/common/ntrack.h -%_includedir/ntrack/common/ntrackbase.h -%_includedir/ntrack/common/ntrackcompare.h -%_includedir/ntrack/common/ntrackidpool.h -%_includedir/ntrack/common/ntracklist.h -%_includedir/ntrack/common/ntrackmacros.h -%_includedir/ntrack/common/ntrackmonitor.h -%_includedir/ntrack/common/ntrackutil.h -%_libdir/libntrack.so -%_libdir/pkgconfig/libntrack.pc +%dir %{_includedir}/ntrack +%dir %{_includedir}/ntrack/common +%{_includedir}/ntrack/common/ntrack.h +%{_includedir}/ntrack/common/ntrackbase.h +%{_includedir}/ntrack/common/ntrackcompare.h +%{_includedir}/ntrack/common/ntrackidpool.h +%{_includedir}/ntrack/common/ntracklist.h +%{_includedir}/ntrack/common/ntrackmacros.h +%{_includedir}/ntrack/common/ntrackmonitor.h +%{_includedir}/ntrack/common/ntrackutil.h +%{_libdir}/libntrack.so +%{_libdir}/pkgconfig/libntrack.pc %files -n lib%{name}-qt4-%{qt4_soname} %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README -%_libdir/libntrack-qt4.so.%{qt4_soname}* +%{_libdir}/libntrack-qt4.so.%{qt4_soname}* %files -n lib%{name}-qt4-devel %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README -%dir %_includedir/ntrack -%dir %_includedir/ntrack/qt4 -%_includedir/ntrack/qt4/QNtrack.h -%_libdir/libntrack-qt4.so -%_libdir/pkgconfig/libntrack-qt4.pc +%dir %{_includedir}/ntrack +%dir %{_includedir}/ntrack/qt4 +%{_includedir}/ntrack/qt4/QNtrack.h +%{_libdir}/libntrack-qt4.so +%{_libdir}/pkgconfig/libntrack-qt4.pc %files -n lib%{name}-glib%{glib_soname} %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README -%_libdir/libntrack-glib.so.%{glib_soname}* +%{_libdir}/libntrack-glib.so.%{glib_soname}* %files -n lib%{name}-glib-devel %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README -%dir %_includedir/ntrack -%dir %_includedir/ntrack/glib -%_includedir/ntrack/glib/ntrack-enums.h -%_includedir/ntrack/glib/ntrack-glib.h -%_includedir/ntrack/glib/ntrack-gsource.h -%_libdir/libntrack-glib.so -%_libdir/pkgconfig/libntrack-glib.pc +%dir %{_includedir}/ntrack +%dir %{_includedir}/ntrack/glib +%{_includedir}/ntrack/glib/ntrack-enums.h +%{_includedir}/ntrack/glib/ntrack-glib.h +%{_includedir}/ntrack/glib/ntrack-gsource.h +%{_libdir}/libntrack-glib.so +%{_libdir}/pkgconfig/libntrack-glib.pc %files -n lib%{name}-gobject%{gobject_soname} %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README -%_libdir/libntrack-gobject.so.%{gobject_soname}* +%{_libdir}/libntrack-gobject.so.%{gobject_soname}* %files -n lib%{name}-gobject-devel %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README -%dir %_includedir/ntrack -%dir %_includedir/ntrack/gobject -%_includedir/ntrack/gobject/ntrack-enumtypes.h -%_includedir/ntrack/gobject/ntrack-gmarshal.h -%_includedir/ntrack/gobject/ntrack-gmonitor.h -%_includedir/ntrack/gobject/ntrack-gobject.h -%_libdir/libntrack-gobject.so -%_libdir/pkgconfig/libntrack-gobject.pc +%dir %{_includedir}/ntrack +%dir %{_includedir}/ntrack/gobject +%{_includedir}/ntrack/gobject/ntrack-enumtypes.h +%{_includedir}/ntrack/gobject/ntrack-gmarshal.h +%{_includedir}/ntrack/gobject/ntrack-gmonitor.h +%{_includedir}/ntrack/gobject/ntrack-gobject.h +%{_libdir}/libntrack-gobject.so +%{_libdir}/pkgconfig/libntrack-gobject.pc %files -n python-lib%{name} %defattr(-,root,root) @@ -276,8 +278,8 @@ %files libnl%{libnl_soname} %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README -%dir %_libdir/ntrack -%dir %_libdir/ntrack/modules -%_libdir/ntrack/modules/ntrack-libnl%{libnl_soname}.so +%dir %{_libdir}/ntrack +%dir %{_libdir}/ntrack/modules +%{_libdir}/ntrack/modules/ntrack-libnl%{libnl_soname}.so %changelog ++++++ libnl3-fix.patch ++++++ Index: modules/ntrack-libnl.c =================================================================== --- modules/ntrack-libnl.c.orig +++ modules/ntrack-libnl.c @@ -530,7 +530,7 @@ update_connectivity (ntrack_monitor_t *s 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(&route_obj_ops) | ROUTE_ATTR_OIF | ROUTE_ATTR_GATEWAY) & nl_object_diff (OBJ_CAST (nl_info->topmost_route), OBJ_CAST (topmost_route)))) { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
