From 2a7d6c80563b0805463f88105fa83653c1542442f6c5a7f9abafcd892ba0e041 Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@suse.de>
Date: Wed, 29 Jul 2015 12:53:55 +0000
Subject: [PATCH] osc copypac from project:Base:System
package:linux-glibc-devel revision:90
OBS-URL: https://build.opensuse.org/package/show/Base:System/linux-glibc-devel?expand=0&rev=92
---
linux-glibc-devel-if_pppox-includes.patch | 21 ---------------------
linux-glibc-devel.changes | 6 ------
linux-glibc-devel.spec | 3 ---
3 files changed, 30 deletions(-)
delete mode 100644 linux-glibc-devel-if_pppox-includes.patch
diff --git a/linux-glibc-devel-if_pppox-includes.patch b/linux-glibc-devel-if_pppox-includes.patch
deleted file mode 100644
index 308c4e7..0000000
--- a/linux-glibc-devel-if_pppox-includes.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Fixes userspace compilation error:
-
-error: "IFNAMSIZ" undeclared here (not in a function)
-
-Signed-off-by: Mikko Rapeli <mikko.rapeli [at] iki>
----
-include/uapi/linux/if_pppox.h | 1 +
-1 file changed, 1 insertion(+)
-
-Index: linux-glibc-devel-4.1/usr/include/linux/if_pppox.h
-===================================================================
---- linux-glibc-devel-4.1.orig/usr/include/linux/if_pppox.h
-+++ linux-glibc-devel-4.1/usr/include/linux/if_pppox.h
-@@ -21,6 +21,7 @@
- #include <asm/byteorder.h>
-
- #include <linux/socket.h>
-+#include <linux/if.h>
- #include <linux/if_ether.h>
- #include <linux/if_pppol2tp.h>
-
diff --git a/linux-glibc-devel.changes b/linux-glibc-devel.changes
index e05d0d6..a5d7339 100644
--- a/linux-glibc-devel.changes
+++ b/linux-glibc-devel.changes
@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-Wed Jul 29 10:44:36 UTC 2015 - dimstar@opensuse.org
-
-- Add linux-glibc-devel-if_pppox-includes.patch: fix compilation of
- userspace programs including if_pppox.h (e.g. ebtables).
-
-------------------------------------------------------------------
Fri Jul 3 18:19:17 UTC 2015 - crrodriguez@opensuse.org
diff --git a/linux-glibc-devel.spec b/linux-glibc-devel.spec
index bb52755..6e23672 100644
--- a/linux-glibc-devel.spec
+++ b/linux-glibc-devel.spec
@@ -37,8 +37,6 @@ Obsoletes: linux-kernel-headers < %{version}
PreReq: coreutils
Source: %{name}-%{upstream_version}.tar.xz
Source1: install_all.sh
-# PATCH-FIX-UPSTREAM linux-glibc-devel-if_pppox-includes.patch dimstar@opensuse.org -- Fixes userspace compilation error
-Patch0: linux-glibc-devel-if_pppox-includes.patch
%description
This package provides Linux kernel headers, the kernel API description
@@ -51,7 +49,6 @@ packages, instead.
%prep
%setup -q -n linux-glibc-devel-%{upstream_version}
-%patch0 -p1
%build
cat > version.h <<-BOGUS