- fix pkt_sched.h

Changed files:
    linux-libc-headers-wrr.patch -> 1.2
    linux-libc-headers.spec -> 1.59

diff --git a/linux-libc-headers-wrr.patch b/linux-libc-headers-wrr.patch
index 609005df670dd2ce55096cd0450f139ab5fc53e2..9873e6ed268f1a3e199bbe8b3ac1e53ac9acdcd2 100644 (file)
--- a/linux-libc-headers-wrr.patch
+++ b/linux-libc-headers-wrr.patch
@@ -1,14 +1,22 @@
---- linux-libc-headers-2.6.5.1/include/linux/pkt_sched.h.orig  2004-05-08 18:48:47.000000000 +0200
-+++ linux-libc-headers-2.6.5.1/include/linux/pkt_sched.h       2004-05-08 18:50:40.189566024 +0200
-@@ -442,6 +442,118 @@
+diff -urN linux-libc-headers-2.6.7.0.org/include/linux/pkt_sched.h linux-libc-headers-2.6.7.0/include/linux/pkt_sched.h
+--- linux-libc-headers-2.6.7.0.org/include/linux/pkt_sched.h   2004-08-04 19:36:56.953369088 +0200
++++ linux-libc-headers-2.6.7.0/include/linux/pkt_sched.h       2004-08-04 19:45:15.968507256 +0200
+@@ -2,7 +2,8 @@
+ #define __LINUX_PKT_SCHED_H
+ 
+ #include <asm/types.h>
+-
++#include <sys/time.h>
++#include <linux/if_ether.h>
+ 
+ /* Logical priority bands not depending on specific packet scheduler.
+    Every scheduler will map them to real traffic classes, if it has
+@@ -432,6 +433,115 @@
  
  #define TCA_ATM_MAX   TCA_ATM_STATE
  
 +/* WRR section */
 +
-+/* Other includes */
-+#include <linux/if_ether.h>
-+
 +// A sub weight and of a class
 +// All numbers are represented as parts of (2^64-1).
 +struct tc_wrr_class_weight {

diff --git a/linux-libc-headers.spec b/linux-libc-headers.spec
index e135ea165d27cd8af8c6a6b518760d71e2c84389..7cf1db3abdf6ffe55ebce6433226931983432e40 100644 (file)
--- a/linux-libc-headers.spec
+++ b/linux-libc-headers.spec
@@ -2,7 +2,7 @@ Summary:        Linux kernel headers for use with C libraries
 Summary(pl):   Nag³ówki j±dra Linuksa do u¿ytku z bibliotekami C
 Name:          linux-libc-headers
 Version:       2.6.7.0
-Release:       8
+Release:       9
 Epoch:         7
 License:       GPL
 Group:         Development
@@ -44,8 +44,7 @@ potrzebne do przebudowania pakietu glibc.
 %prep
 %setup -q
 %patch0 -p1
-# wrr is broken. try to compile/preprocess this one: #include <linux/pkt_sched.h>
-#%patch1 -p1
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1