integrate build-fixes2.diff into build-fixes.diff

OBS-URL: https://build.opensuse.org/package/show/network:telephony/osmo-ggsn?expand=0&rev=5

osmo-ggsn.spec

@@ -24,9 +24,8 @@ License:        GPL-2.0 AND LGPL-2.1+
 Group:          Productivity/Telephony/Servers
 URL:            https://osmocom.org/projects/openggsn/wiki/OsmoGGSN
 Source:         %name-%version.tar.xz
-#Patch1:         build-fixes.diff
-Patch2:         build-fixes2.diff
-Patch3:         0001-fix-compiler-warnings-return-0-in-main-in-3-tests.patch
+Patch1:         build-fixes.diff
+Patch2:         0001-fix-compiler-warnings-return-0-in-main-in-3-tests.patch
 BuildRequires:  libtool >= 2
 BuildRequires:  pkgconfig >= 0.20
 BuildRequires:  systemd-rpm-macros
@@ -67,29 +66,25 @@ applications that want to make use of libgtp.
 
 %prep
 %setup -q
-#%%patch -P 1 -p1
-%patch2 -p1
-%patch3 -p1
+%patch -P 1 -P 2 -p1
 
 %build
 echo "%version" >.tarball-version
 autoreconf -fi
-%configure \
-  --disable-static \
-  --docdir=%_docdir/%name \
-  --includedir="%_includedir/%name"
+%configure --disable-static --docdir="%_docdir/%name" \
+	--includedir="%_includedir/%name"
 make %{?_smp_mflags} V=1
 
 %install
-b=%buildroot
+b="%buildroot"
 %make_install
-find %buildroot -type f -name "*.la" -delete -print
+find $b -type f -name "*.la" -delete -print
 install -D -m 0644 contrib/osmo-ggsn.service "$b/%_unitdir/%name.service"
-install -d %buildroot/%_sbindir
-ln -s %_sbindir/service %buildroot%_sbindir/rc%name
-install -d %buildroot%_sysconfdir/osmocom
-install -m 0644 doc/examples/osmo-ggsn.cfg %buildroot%_sysconfdir/osmocom/osmo-ggsn.cfg
-install -m 0644 doc/examples/sgsnemu.conf %buildroot%_sysconfdir/osmocom/sgsnemu.conf
+install -d "$b/%_sbindir"
+ln -s "%_sbindir/service" "$b/%_sbindir/rc%name"
+install -d "$b/%_sysconfdir/osmocom"
+install -m 0644 doc/examples/osmo-ggsn.cfg "$b/%_sysconfdir/osmocom/osmo-ggsn.cfg"
+install -m 0644 doc/examples/sgsnemu.conf "$b/%_sysconfdir/osmocom/sgsnemu.conf"
 
 %pre
 %service_add_pre %name.service