From ceb1fd2758bcde68ca9e069496f5b31725855564e3e60c8604c02dd584613c8b Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 17 Oct 2016 12:51:51 +0000 Subject: [PATCH] Accepting request 435704 from home:Andreas_Schwab:Factory - linux-atm-2.5.2-fix-header-conflict.patch: avoid conflict with kernel headers OBS-URL: https://build.opensuse.org/request/show/435704 OBS-URL: https://build.opensuse.org/package/show/Base:System/linux-atm?expand=0&rev=17 --- linux-atm-2.5.2-fix-header-conflict.patch | 12 ++++++++++++ linux-atm.changes | 6 ++++++ linux-atm.spec | 5 ++++- 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 linux-atm-2.5.2-fix-header-conflict.patch diff --git a/linux-atm-2.5.2-fix-header-conflict.patch b/linux-atm-2.5.2-fix-header-conflict.patch new file mode 100644 index 0000000..12cdb83 --- /dev/null +++ b/linux-atm-2.5.2-fix-header-conflict.patch @@ -0,0 +1,12 @@ +Index: linux-atm-2.5.2/src/maint/zntune.c +=================================================================== +--- linux-atm-2.5.2.orig/src/maint/zntune.c ++++ linux-atm-2.5.2/src/maint/zntune.c +@@ -14,6 +14,7 @@ + #include + #include + #include /* for struct timeval, although it's not used */ ++#define _LINUX_TIME_H /* block linux/time.h from being included */ + #include + + diff --git a/linux-atm.changes b/linux-atm.changes index dec9ca9..e9954d9 100644 --- a/linux-atm.changes +++ b/linux-atm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 17 09:36:39 UTC 2016 - schwab@suse.de + +- linux-atm-2.5.2-fix-header-conflict.patch: avoid conflict with kernel + headers + ------------------------------------------------------------------- Thu Jan 23 21:59:12 UTC 2014 - aj@ajaissle.de diff --git a/linux-atm.spec b/linux-atm.spec index d05c0bc..67f9e4f 100644 --- a/linux-atm.spec +++ b/linux-atm.spec @@ -1,7 +1,7 @@ # # spec file for package linux-atm # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX 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,6 +30,8 @@ Source0: http://downloads.sourceforge.net/project/%{name}/%{name}/%{versi Patch0: linux-atm-2.5.2_fdleak.patch # PATCH-FIX-UPSTREAM linux-atm-2.5.2_implicit-fortify-decl.patch -- fix implicit declarations Patch1: linux-atm-2.5.2_implicit-fortify-decl.patch +# PATCH-FIX-UPSTREAM linux-atm-2.5.2-fix-header-conflict.patch -- avoid conflict with kernel headers +Patch2: linux-atm-2.5.2-fix-header-conflict.patch BuildRequires: bison BuildRequires: flex @@ -63,6 +65,7 @@ networking. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %configure --disable-static