Hello community, here is the log from the commit of package iproute2 for openSUSE:Factory checked in at 2015-06-24 20:30:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iproute2 (Old) and /work/SRC/openSUSE:Factory/.iproute2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "iproute2" Changes: -------- --- /work/SRC/openSUSE:Factory/iproute2/iproute2-doc.changes 2015-04-22 01:10:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.iproute2.new/iproute2-doc.changes 2015-06-24 20:30:19.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jun 16 08:46:47 UTC 2015 - [email protected] + +- Update iproute2-dirs.diff to respect /usr/share/tc [bnc#934828] + +------------------------------------------------------------------- iproute2.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ iproute2.spec: same change ++++++ iproute2-dirs.diff ++++++ --- /var/tmp/diff_new_pack.LJaMTj/_old 2015-06-24 20:30:21.000000000 +0200 +++ /var/tmp/diff_new_pack.LJaMTj/_new 2015-06-24 20:30:21.000000000 +0200 @@ -2,12 +2,13 @@ Makefile | 4 ++-- include/iptables.h | 2 +- netem/Makefile | 6 ++++-- - 3 files changed, 7 insertions(+), 5 deletions(-) + tc/q_netem.c | 2 +- + 4 files changed, 8 insertions(+), 6 deletions(-) -Index: iproute2-3.15.0/Makefile +Index: iproute2-4.0.0/Makefile =================================================================== ---- iproute2-3.15.0.orig/Makefile -+++ iproute2-3.15.0/Makefile +--- iproute2-4.0.0.orig/Makefile ++++ iproute2-4.0.0/Makefile @@ -1,7 +1,7 @@ ROOTDIR=$(DESTDIR) PREFIX=/usr @@ -17,19 +18,19 @@ CONFDIR=/etc/iproute2 DATADIR=$(PREFIX)/share DOCDIR=$(DATADIR)/doc/iproute2 -@@ -33,7 +33,7 @@ CCOPTS = -O2 - WFLAGS := -Wall -Wstrict-prototypes -Wmissing-prototypes - WFLAGS += -Wmissing-declarations -Wold-style-definition -Wformat=2 - --CFLAGS = $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) -+CFLAGS = -DLIBDIR=\"${LIBDIR}\" $(WFLAGS) $(CCOPTS) -I../include $(DEFINES) - YACCFLAGS = -d -t -v +@@ -13,7 +13,7 @@ DBM_INCLUDE:=$(ROOTDIR)/usr/include - SUBDIRS=lib ip tc bridge misc netem genl man -Index: iproute2-3.15.0/include/iptables.h + SHARED_LIBS = y + +-DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" ++DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" -DPKGDATADIR=\"$(DATADIR)/tc\" + ifneq ($(SHARED_LIBS),y) + DEFINES+= -DNO_SHARED_LIBS + endif +Index: iproute2-4.0.0/include/iptables.h =================================================================== ---- iproute2-3.15.0.orig/include/iptables.h -+++ iproute2-3.15.0/include/iptables.h +--- iproute2-4.0.0.orig/include/iptables.h ++++ iproute2-4.0.0/include/iptables.h @@ -5,7 +5,7 @@ #include "libiptc/libiptc.h" @@ -39,10 +40,10 @@ #endif #ifndef IPPROTO_SCTP -Index: iproute2-3.15.0/netem/Makefile +Index: iproute2-4.0.0/netem/Makefile =================================================================== ---- iproute2-3.15.0.orig/netem/Makefile -+++ iproute2-3.15.0/netem/Makefile +--- iproute2-4.0.0.orig/netem/Makefile ++++ iproute2-4.0.0/netem/Makefile @@ -5,6 +5,8 @@ HOSTCC ?= $(CC) CCOPTS = $(CBUILD_CFLAGS) LDLIBS += -lm @@ -64,3 +65,16 @@ done clean: +Index: iproute2-4.0.0/tc/q_netem.c +=================================================================== +--- iproute2-4.0.0.orig/tc/q_netem.c ++++ iproute2-4.0.0/tc/q_netem.c +@@ -113,7 +113,7 @@ static int get_distribution(const char * + char *line = NULL; + char name[128]; + +- snprintf(name, sizeof(name), "%s/%s.dist", get_tc_lib(), type); ++ snprintf(name, sizeof(name), "%s/%s.dist", PKGDATADIR, type); + if ((f = fopen(name, "r")) == NULL) { + fprintf(stderr, "No distribution data for %s (%s: %s)\n", + type, name, strerror(errno));
