From b083f51e2094b6a1a9271bbba0a2547c51303db0df464f29f96f25d02e5905be Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Fri, 5 Jan 2018 22:54:32 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/network:telephony/osmo-ggsn?expand=0&rev=6

---
 build-fixes2.diff | 47 -----------------------------------------------
 osmo-ggsn.changes |  3 ---
 2 files changed, 50 deletions(-)
 delete mode 100644 build-fixes2.diff

diff --git a/build-fixes2.diff b/build-fixes2.diff
deleted file mode 100644
index 95b40b8..0000000
--- a/build-fixes2.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/ggsn/Makefile.am b/ggsn/Makefile.am
-index 8a468a9..0d8d8ff 100644
---- a/ggsn/Makefile.am
-+++ b/ggsn/Makefile.am
-@@ -1,8 +1,9 @@
--bin_PROGRAMS = osmo-ggsn
-+sbin_PROGRAMS = osmo-ggsn
- 
- AM_LDFLAGS = @EXEC_LDFLAGS@
- 
--AM_CFLAGS = -O2 -D_GNU_SOURCE -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' -ggdb $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)
-+AM_CPPFLAGS = -D_GNU_SOURCE -DSBINDIR='"${sbindir}"' ${LIBOSMOCORE_CFLAGS} ${LIBOSMOCTRL_CFLAGS} ${LIBOSMOVTY_CFLAGS}
-+AM_CFLAGS = -fno-builtin -Wall
- 
- osmo_ggsn_LDADD = @EXEC_LDADD@ -lgtp -L../gtp ../lib/libmisc.a $(LIBOSMOCORE_LIBS) $(LIBOSMOCTRL_LIBS) $(LIBOSMOVTY_LIBS)
- 
-diff --git a/gtp/Makefile.am b/gtp/Makefile.am
-index 7a0ff0a..211abc3 100644
---- a/gtp/Makefile.am
-+++ b/gtp/Makefile.am
-@@ -6,7 +6,8 @@ lib_LTLIBRARIES = libgtp.la
- 
- include_HEADERS = gtp.h pdp.h gtpie.h
- 
--AM_CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' -ggdb $(LIBOSMOCORE_CFLAGS)
-+AM_CPPFLAGS = -DSBINDIR='"$(sbindir)"' $(LIBOSMOCORE_CFLAGS)
-+AM_CFLAGS = -O2 -fno-builtin -Wall -ggdb
- 
- libgtp_la_SOURCES = gtp.c gtp.h gtpie.c gtpie.h pdp.c pdp.h lookupa.c lookupa.h queue.c queue.h
- libgtp_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined
-diff --git a/sgsnemu/Makefile.am b/sgsnemu/Makefile.am
-index 4d02eca..32df2a3 100644
---- a/sgsnemu/Makefile.am
-+++ b/sgsnemu/Makefile.am
-@@ -1,8 +1,10 @@
--bin_PROGRAMS = sgsnemu
-+sbin_PROGRAMS = sgsnemu
- 
- AM_LDFLAGS = @EXEC_LDFLAGS@
- 
--AM_CFLAGS = -O2 -D_GNU_SOURCE -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' -ggdb $(LIBOSMOCORE_CFLAGS)
-+AM_CPPFLAGS = -D_GNU_SOURCE -DSBINDIR='"$(sbindir)"' $(LIBOSMOCORE_CFLAGS)
-+AM_CFLAGS = -O2 -fno-builtin -Wall -ggdb
-+
- 
- sgsnemu_LDADD = @EXEC_LDADD@ -lgtp -L../gtp ../lib/libmisc.a $(LIBOSMOCORE_LIBS)
- sgsnemu_DEPENDENCIES = ../gtp/libgtp.la ../lib/libmisc.a
diff --git a/osmo-ggsn.changes b/osmo-ggsn.changes
index 412101d..1f82c73 100644
--- a/osmo-ggsn.changes
+++ b/osmo-ggsn.changes
@@ -6,10 +6,7 @@ Fri Dec 29 16:38:27 UTC 2017 - mardnh@gmx.de
 - Use correct libversion
 - Minor specfile cleanup
 - Disable kernel-gtp support
-- Do not apply patch (broken in some parts)
-  - build-fixes.diff
 - Add patch:
-  - build-fixes2.diff
   - 0001-fix-compiler-warnings-return-0-in-main-in-3-tests.patch
 
 -------------------------------------------------------------------