[packages/clthreads] - updated to 2.4.2 - updated makefile patch

[qboosh]

commit 0caf1a5e963cf6cb96b741f9fc031adcae082582
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Sep 26 21:56:39 2021 +0200

    - updated to 2.4.2
    - updated makefile patch

 clthreads.spec | 29 +++++++++++++++++------------
 makefile.patch | 32 +++++++++++++++++++-------------
 2 files changed, 36 insertions(+), 25 deletions(-)
---
diff --git a/clthreads.spec b/clthreads.spec
index dcaafce..1a88077 100644
--- a/clthreads.spec
+++ b/clthreads.spec
@@ -1,11 +1,13 @@
 Summary:	Kokkini Zita clthreads library
+Summary(pl.UTF-8):	Biblioteka Kokkini Zita clthreads
 Name:		clthreads
-Version:	2.4.0
+Version:	2.4.2
 Release:	1
-License:	LGPL v2.1
+# as specified in source files (included COPYING is LGPL v2.1)
+License:	GPL v2+
 Group:		Libraries
 Source0:	http://kokkinizita.linuxaudio.org/linuxaudio/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5:	90b650f1f5c9f39f4d77f73aca3c53be
+# Source0-md5:	6c82e4edece2db2de9451b6afe702a86
 Patch0:		makefile.patch
 URL:		http://kokkinizita.linuxaudio.org/linuxaudio/
 BuildRequires:	libstdc++-devel
@@ -14,6 +16,9 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %description
 clthreads library, used by Kokkini Zita Linux Audio projects.
 
+%description -l pl.UTF-8
+Biblioteka clthreads, używana przez projekty Kokkini Zita Linux Audio.
+
 %package devel
 Summary:	Header files for %{name} library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki %{name}
@@ -34,16 +39,16 @@ Pliki nagłówkowe biblioteki %{name}.
 CXX="%{__cxx}" \
 CPPFLAGS="%{rpmcxxflags} %{rpmcppflags}" \
 LDFLAGS="%{rpmldflags}" \
-%{__make}
+%{__make} -C source
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 install -d $RPM_BUILD_ROOT%{_includedir}
 
-%{__make} install \
-	LIBDIR="%{_lib}" \
-	PREFIX=$RPM_BUILD_ROOT%{_prefix}
+%{__make} -C source install \
+	DESTDIR=$RPM_BUILD_ROOT \
+	PREFIX=%{_prefix} \
+	LIBDIR=%{_libdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -54,10 +59,10 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS
-%attr(755,root,root) %{_libdir}/lib%{name}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/lib%{name}.so.2
+%attr(755,root,root) %{_libdir}/libclthreads.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclthreads.so.2
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib%{name}.so
-%{_includedir}/%{name}.h
+%attr(755,root,root) %{_libdir}/libclthreads.so
+%{_includedir}/clthreads.h
diff --git a/makefile.patch b/makefile.patch
index df2ea92..f35825d 100644
--- a/makefile.patch
+++ b/makefile.patch
@@ -1,21 +1,27 @@
-diff -dur clthreads-2.4.0.orig/Makefile clthreads-2.4.0/Makefile
---- clthreads-2.4.0.orig/Makefile	2008-03-22 22:48:25.000000000 +0100
-+++ clthreads-2.4.0/Makefile	2016-10-15 12:37:50.436941322 +0200
-@@ -28,7 +28,7 @@
- DISTDIR = clthreads-$(VERSION)
+--- clthreads-2.4.2/source/Makefile.orig	2018-08-24 20:40:37.000000000 +0200
++++ clthreads-2.4.2/source/Makefile	2021-09-26 21:55:07.580681263 +0200
+@@ -32,8 +32,7 @@ VERSION = $(MAJVERS).$(MINVERS)
  
  
--CPPFLAGS += -Wall -I. -fpic -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O2 
-+CPPFLAGS += -Wall -I. -fpic -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
+ CPPFLAGS += -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -I.  
+-CXXFLAGS += -Wall -O2 -fPIC
+-CXXFLAGS += -march=native
++CXXFLAGS += -Wall -fPIC
  LDLFAGS += 
  LDLIBS +=
  
-@@ -42,7 +42,7 @@
- 
- 
- $(CLTHREADS_MIN): $(CLTHREADS_O)
--	g++ -shared $(LDFLAGS) -Wl,-soname,$(CLTHREADS_MAJ) -o $(CLTHREADS_MIN) $(CLTHREADS_O) $(CLTHREADS_DEP)
-+	$(CXX) -shared $(LDFLAGS) -Wl,-soname,$(CLTHREADS_MAJ) -o $(CLTHREADS_MIN) $(CLTHREADS_O) $(CLTHREADS_DEP)
+@@ -51,11 +50,11 @@ $(CLTHREADS_MIN): $(CLTHREADS_O)
  
  
  install:	$(CLTHREADS_MIN)
+-	install -d $(DESTDIR)$(PREFIX)/$(INCDIR)
+-	install -d $(DESTDIR)$(PREFIX)/$(LIBDIR)
++	install -d $(DESTDIR)$(INCDIR)
++	install -d $(DESTDIR)$(LIBDIR)
+ 	install -m 644 $(CLTHREADS_H) $(DESTDIR)$(INCDIR)
+ 	install -m 755 $(CLTHREADS_MIN) $(DESTDIR)$(LIBDIR)
+-	ldconfig
++	-/sbin/ldconfig -n -N $(DESTDIR)$(LIBDIR)
+ 	ln -sf $(CLTHREADS_MIN) $(DESTDIR)$(LIBDIR)/$(CLTHREADS_SO)
+ 
+ uninstall:
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/clthreads.git/commitdiff/0caf1a5e963cf6cb96b741f9fc031adcae082582