From d32cb7f84ee0659d0ca89384f481b23640af033e665befe313f59dab59a6f718 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <bjorn.lie@gmail.com>
Date: Mon, 9 Sep 2019 10:53:47 +0000
Subject: [PATCH] Accepting request 729114 from GNOME:Next

Drop obsolete patch

OBS-URL: https://build.opensuse.org/request/show/729114
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libsigc++2?expand=0&rev=59
---
 libsigc++-std-c11.patch | 10 ----------
 libsigc++2.changes      |  7 +++++++
 libsigc++2.spec         | 12 ++++--------
 3 files changed, 11 insertions(+), 18 deletions(-)
 delete mode 100644 libsigc++-std-c11.patch

diff --git a/libsigc++-std-c11.patch b/libsigc++-std-c11.patch
deleted file mode 100644
index bd8907f..0000000
--- a/libsigc++-std-c11.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: libsigc++-2.6.2/sigc++.pc.in
-===================================================================
---- libsigc++-2.6.2.orig/sigc++.pc.in
-+++ libsigc++-2.6.2/sigc++.pc.in
-@@ -15,4 +15,4 @@ Description: Typesafe signal and callbac
- Version: @PACKAGE_VERSION@
- URL: http://libsigc.sourceforge.net/
- Libs: -L${libdir} -lsigc-@SIGCXX_API_VERSION@
--Cflags: -I${includedir}/sigc++-@SIGCXX_API_VERSION@ -I${libdir}/sigc++-@SIGCXX_API_VERSION@/include
-+Cflags: -I${includedir}/sigc++-@SIGCXX_API_VERSION@ -I${libdir}/sigc++-@SIGCXX_API_VERSION@/include -std=c++11
diff --git a/libsigc++2.changes b/libsigc++2.changes
index 8323241..a034914 100644
--- a/libsigc++2.changes
+++ b/libsigc++2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Sep  7 17:58:29 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Drop conditional libsigc++-std-c11.patch: No longer needed for
+  any currently supported version of openSUSE.
+- Use make_build macro.
+
 -------------------------------------------------------------------
 Wed Aug 14 16:45:24 CEST 2019 - bjorn.lie@gmail.com
 
diff --git a/libsigc++2.spec b/libsigc++2.spec
index 565ec3d..3a34b14 100644
--- a/libsigc++2.spec
+++ b/libsigc++2.spec
@@ -24,10 +24,9 @@ Summary:        Typesafe Signal Framework for C++
 License:        LGPL-2.1-or-later
 Group:          Development/Libraries/C and C++
 URL:            http://libsigc.sourceforge.net/
-Source:         http://download.gnome.org/sources/libsigc++/2.10/%{_name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/libsigc++/2.10/%{_name}-%{version}.tar.xz
 Source99:       baselibs.conf
-# PATCH-FIX-OPENSUSE libsigc++-std-c11.patch dimstar@opensuse.org -- Add -std=c11 to CFLAGS when using libsigc++ to build. This is not upstreamable in this form as the used CXX macro should handle that, so needs more work (and entry points in mm-common)
-Patch0:         libsigc++-std-c11.patch
+
 BuildRequires:  gcc-c++
 BuildRequires:  m4
 BuildRequires:  pkgconfig
@@ -70,13 +69,10 @@ of use unmatched by other C++ callback libraries.
 
 %prep
 %setup -q -n %{_name}-%{version}
-if [ $(gcc -dumpversion | awk -F. '{print $1}') -lt 6 ]; then
-%patch0 -p1
-fi
 
 %build
 %configure --disable-static
-make %{?_smp_mflags}
+%make_build
 
 %install
 %make_install
@@ -84,7 +80,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
 
 %check
 export MALLOC_CHECK_=2 MALLOC_PERTURB_=$((${RANDOM:-256} % 256))
-make %{?_smp_mflags} check
+%make_build check
 unset MALLOC_CHECK_ MALLOC_PERTURB_
 
 %post -n libsigc-2_0-0 -p /sbin/ldconfig