[packages/clxclient] - updated to 3.9.2 - updated makefile patch

[qboosh]

commit 3daea4e6feb538aa9d9750babf98bb31ecf46653
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Sep 27 19:41:55 2021 +0200

    - updated to 3.9.2
    - updated makefile patch

 clxclient.spec | 37 +++++++++++++++++++++----------------
 makefile.patch | 39 +++++++++++++++++----------------------
 2 files changed, 38 insertions(+), 38 deletions(-)
---
diff --git a/clxclient.spec b/clxclient.spec
index c68e0c5..ba83351 100644
--- a/clxclient.spec
+++ b/clxclient.spec
@@ -1,29 +1,33 @@
 Summary:	Kokkini Zita clxclient library
+Summary(pl.UTF-8):	Biblioteka Kokkini Zita clxclient
 Name:		clxclient
-Version:	3.9.0
+Version:	3.9.2
 Release:	1
-License:	LGPL v2.1
+License:	LGPL v2+
 Group:		Libraries
 Source0:	http://kokkinizita.linuxaudio.org/linuxaudio/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5:	bd6df73f688c9be1b3afef58283d7ef5
+# Source0-md5:	39af7de7888fb4d37362edbc94566314
 Patch0:		makefile.patch
 URL:		http://kokkinizita.linuxaudio.org/linuxaudio/
 BuildRequires:	clthreads-devel
-BuildRequires:	freetype-devel
+BuildRequires:	libstdc++-devel
 BuildRequires:	xorg-lib-libX11-devel
-BuildRequires:	xorg-lib-libXft-devel
+BuildRequires:	xorg-lib-libXft-devel >= 2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 clxclient library, used by Kokkini Zita Linux Audio projects.
 
+%description -l pl.UTF-8
+Biblioteka clxclient, używana w projektach Kokkini Zita Linux Audio.
+
 %package devel
 Summary:	Header files for %{name} library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki %{name}
 Group:		Development/Libraries
-Requires:	freetype-devel
+Requires:	libstdc++-devel
 Requires:	xorg-lib-libX11-devel
-Requires:	xorg-lib-libXft-devel
+Requires:	xorg-lib-libXft-devel >= 2
 Requires:	%{name} = %{version}-%{release}
 
 %description devel
@@ -40,17 +44,18 @@ Pliki nagłówkowe biblioteki %{name}.
 CXX="%{__cxx}" \
 CXXFLAGS="%{rpmcxxflags} %{rpmcppflags}" \
 LDFLAGS="%{rpmldflags}" \
-%{__make} \
-	LIBDIR="%{_lib}"
+%{__make} -C source \
+	LIBDIR=%{_libdir}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_includedir}
 
-%{__make} install \
-	PREFIX=$RPM_BUILD_ROOT%{_prefix} \
-	LIBDIR="%{_lib}"
+%{__make} -C source install \
+	DESTDIR=$RPM_BUILD_ROOT \
+	PREFIX=%{_prefix} \
+	LIBDIR=%{_libdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -61,10 +66,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.3
+%attr(755,root,root) %{_libdir}/libclxclient.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclxclient.so.3
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib%{name}.so
-%{_includedir}/%{name}.h
+%attr(755,root,root) %{_libdir}/libclxclient.so
+%{_includedir}/clxclient.h
diff --git a/makefile.patch b/makefile.patch
index 07091cf..5a1099e 100644
--- a/makefile.patch
+++ b/makefile.patch
@@ -1,16 +1,18 @@
-diff -dur clxclient-3.9.0.orig/Makefile clxclient-3.9.0/Makefile
---- clxclient-3.9.0.orig/Makefile	2013-06-28 16:50:51.000000000 +0200
-+++ clxclient-3.9.0/Makefile	2016-10-15 12:44:49.260424973 +0200
-@@ -31,7 +31,7 @@
+--- clxclient-3.9.2/source/Makefile.orig	2018-08-24 20:50:31.000000000 +0200
++++ clxclient-3.9.2/source/Makefile	2021-09-27 19:15:58.074346409 +0200
+@@ -30,17 +30,16 @@ MINVERS = 9.2
  VERSION = $(MAJVERS).$(MINVERS)
  
  
--CPPFLAGS += -Wall -I. -I/usr/X11R6/include `freetype-config --cflags` -fpic -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O2 
-+CPPFLAGS += -Wall -I. -I/usr/X11R6/include `freetype-config --cflags` -fpic -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
- LDFLAGS += -L/usr/X11R6/$(LIBDIR) `freetype-config --libs`
+-CPPFLAGS += $(shell pkgconf --cflags freetype2) 
++CPPFLAGS += -I. $(shell pkg-config --cflags xft)
+ CPPFLAGS += -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS $(PCONFCFL)
+-CXXFLAGS += -Wall -O2 -fPIC 
+-CXXFLAGS += -march=native
++CXXFLAGS += -Wall -fPIC
  LDLIBS +=
  
-@@ -39,21 +39,21 @@
+ 
  CLXCLIENT_SO = libclxclient.so
  CLXCLIENT_MAJ = $(CLXCLIENT_SO).$(MAJVERS)
  CLXCLIENT_MIN = $(CLXCLIENT_MAJ).$(MINVERS)
@@ -19,19 +21,12 @@ diff -dur clxclient-3.9.0.orig/Makefile clxclient-3.9.0/Makefile
  CLXCLIENT_O = xdisplay.o xresman.o xhandler.o xwindow.o xdraw.o \
  	button.o textip.o enumip.o menuwin.o scale.o slider.o scroll.o mclist.o meter.o
  CLXCLIENT_H = clxclient.h
- 
- 
- $(CLXCLIENT_MIN): $(CLXCLIENT_O)
--	g++ -shared $(LDFLAGS) -Wl,-soname,$(CLXCLIENT_MAJ) -o $(CLXCLIENT_MIN) $(CLXCLIENT_O) $(CLXCLIENT_DEP)
-+	$(CXX) -shared $(LDFLAGS) -Wl,-soname,$(CLXCLIENT_MAJ) -o $(CLXCLIENT_MIN) $(CLXCLIENT_O) $(CLXCLIENT_DEP)
- 
- 
- install:	$(CLXCLIENT_MIN)
- 	install -d $(PREFIX)/$(LIBDIR)
- 	install -m 644 $(CLXCLIENT_H) $(PREFIX)/include
- 	install -m 755 $(CLXCLIENT_MIN) $(PREFIX)/$(LIBDIR)
+@@ -55,7 +54,7 @@ install:	$(CLXCLIENT_MIN)
+ 	install -d $(DESTDIR)$(LIBDIR)
+ 	install -m 644 $(CLXCLIENT_H) $(DESTDIR)$(INCDIR)
+ 	install -m 755 $(CLXCLIENT_MIN) $(DESTDIR)$(LIBDIR)
 -	ldconfig
-+	/sbin/ldconfig -n -N $(PREFIX)/$(LIBDIR)
- 	ln -sf $(CLXCLIENT_MIN) $(PREFIX)/$(LIBDIR)/$(CLXCLIENT_SO)
- 
++	-/sbin/ldconfig -n -N $(DESTDIR)$(LIBDIR)
+ 	ln -sf $(CLXCLIENT_MIN) $(DESTDIR)$(LIBDIR)/$(CLXCLIENT_SO)
  
+ uninstall:
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/clxclient.git/commitdiff/3daea4e6feb538aa9d9750babf98bb31ecf46653