From 85c71df53b4a3000a75d8c76a768e1430df6934f Mon Sep 17 00:00:00 2001
From: Guido Aulisi <guido.aulisi@gmail.com>
Date: Jul 24 2019 19:09:51 +0000
Subject: Update to 2.4.2


Minor spec cleanup

---

diff --git a/.gitignore b/.gitignore
index f77798d..0eb56d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 clthreads-2.4.0.tar.bz2
+/clthreads-2.4.2.tar.bz2
diff --git a/clthreads.spec b/clthreads.spec
index d6e4d71..19d48ac 100644
--- a/clthreads.spec
+++ b/clthreads.spec
@@ -2,8 +2,8 @@
 
 Summary:       POSIX threads C++ access library
 Name:          clthreads
-Version:       2.4.0
-Release:       22%{?dist}
+Version:       2.4.2
+Release:       1%{?dist}
 License:       LGPLv2+
 URL:           http://kokkinizita.linuxaudio.org/linuxaudio/
 Source0:       http://kokkinizita.linuxaudio.org/linuxaudio/downloads/%{name}-%{version}.tar.bz2
@@ -25,25 +25,24 @@ contains libraries and header files for developing applications that use
 %setup -q
 
 # No need to call ldconfig during packaging
-sed -i '\|/sbin/ldconfig|d' Makefile
+sed -i '\|ldconfig|d' source/Makefile
+
+# Fix Makefile paths (patch sent upstream)
+sed -i -e 's|install -d $(DESTDIR)$(PREFIX)/$(INCDIR)|install -d $(DESTDIR)$(INCDIR)|' \
+ -e 's|install -d $(DESTDIR)$(PREFIX)/$(LIBDIR)|install -d $(DESTDIR)$(LIBDIR)|' source/Makefile
 
 # Preserve timestamps
-sed -i 's|/install|/install -p|' Makefile
-# fix romlint warnings BZ#751466
-sed -i -e 's|-lpthread|-lpthread -lrt|' -e 's! -shared ! -Wl,--as-needed\0!g' Makefile
+sed -i 's|/install|/install -p|' source/Makefile
+
+# No native arch
+sed -i -e '/^CXXFLAGS += -march=native/d' source/Makefile
 
 %build
-export CPPFLAGS="%{optflags}"
-make %{?_smp_mflags} 
+%set_build_flags
+%make_build -C source PREFIX=%{_prefix} LIBDIR=%{_libdir}
 
 %install
-mkdir -p %{buildroot}%{_libdir}
-mkdir -p %{buildroot}%{_includedir}
-make PREFIX=%{buildroot}%{_prefix} LIBDIR=%{_lib} install
-
-# create .so.x link
-ln -s lib%{name}.so.%{version} %{buildroot}%{_libdir}/lib%{name}.so.%{libmajor}
-
+%make_install -C source PREFIX=%{_prefix} LIBDIR=%{_libdir}
 
 %files
 %doc AUTHORS
@@ -55,6 +54,10 @@ ln -s lib%{name}.so.%{version} %{buildroot}%{_libdir}/lib%{name}.so.%{libmajor}
 %{_libdir}/lib%{name}.so
 
 %changelog
+* Mon Jul 22 2019 Guido Aulisi <guido.aulisi@gmail.com> - 2.4.2-1
+- Update to 2.4.2
+- Minor spec cleanup
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-22
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index f265327..8b2f23c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-90b650f1f5c9f39f4d77f73aca3c53be  clthreads-2.4.0.tar.bz2
+SHA512 (clthreads-2.4.2.tar.bz2) = a91de7a287c2cb9b2ce17e4c158db79bbaeccb278510d11e6c05fcbe9295c26b4d0231fa97800b265decd1d0886b7425f7b5d4cbcb18758be540356408e72131