From 6408a85cefa197a2c56a5f3e9608a4963fdef50f Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Wed, 5 Aug 2020 14:51:50 +0200
Subject: [PATCH] Update to version 1.2.5

---
 socket_wrapper.spec | 32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/socket_wrapper.spec b/socket_wrapper.spec
index 4b387c8..0f9db2d 100644
--- a/socket_wrapper.spec
+++ b/socket_wrapper.spec
@@ -1,8 +1,6 @@
-%global __cmake_in_source_build 1
-
 Name:           socket_wrapper
-Version:        1.2.4
-Release:        3%{?dist}
+Version:        1.2.5
+Release:        1%{?dist}
 
 License:        BSD
 Summary:        A library passing all socket communications through Unix sockets
@@ -39,31 +37,21 @@ gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
 %autosetup -p1
 
 %build
-if test ! -e "obj"; then
-mkdir obj
-fi
-pushd obj
 %cmake \
--DUNIT_TESTING=ON \
-%{_builddir}/%{name}-%{version}
+    -DUNIT_TESTING=ON
 
-make %{?_smp_mflags} VERBOSE=1
-popd
+%cmake_build
 
 %install
-pushd obj
-make DESTDIR=%{buildroot} install
-popd
+%cmake_install
 
 %ldconfig_scriptlets
 
 %check
-pushd obj
-ctest --output-on-failure
+%ctest
 
-LD_PRELOAD=src/libsocket_wrapper.so bash -c '>/dev/null'
-
-popd
+ls -l %{__cmake_builddir}/src/libsocket_wrapper.so
+LD_PRELOAD=%{__cmake_builddir}/src/libsocket_wrapper.so bash -c '>/dev/null'
 
 %files
 %doc AUTHORS README.md CHANGELOG
@@ -76,6 +64,10 @@ popd
 %{_mandir}/man1/socket_wrapper.1*
 
 %changelog
+* Wed Aug 05 2020 Andreas Schneider <asn@redhat.com> - 1.2.5-1
+- Update to version 1.2.4
+  * https://gitlab.com/cwrap/socket_wrapper/-/blob/master/CHANGELOG
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild