commit 8ee60b4b0581724c3d9c6cd928ded8a0f73d9dce
Author: Jacek Konieczny <jaj...@jajcus.net>
Date: Sat Oct 15 12:45:55 2016 +0200
fix passing compiler and flags to make
clxclient.spec | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
makefile.patch | 37 ++++++++++++++++++++++++++++++++
2 files changed, 105 insertions(+)
---
diff --git a/clxclient.spec b/clxclient.spec
new file mode 100644
index 0000000..c78a6c8
--- /dev/null
+++ b/clxclient.spec
@@ -0,0 +1,68 @@
+Summary: Kokkini Zita clxclient library
+Name: clxclient
+Version: 3.9.0
+Release: 1
+License: LGPL v2.1
+Group: Libraries
+Source0:
http://kokkinizita.linuxaudio.org/linuxaudio/downloads/%{name}-%{version}.tar.bz2
+# Source0-md5: bd6df73f688c9be1b3afef58283d7ef5
+Patch0: makefile.patch
+URL: http://kokkinizita.linuxaudio.org/linuxaudio/
+BuildRequires: clthreads-devel
+BuildRequires: freetype-devel
+BuildRequires: freetype-devel
+BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xorg-lib-libXft-devel
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+clxclient library, used by Kokkini Zita Linux Audio projects.
+
+%package devel
+Summary: Header files for %{name} library
+Summary(pl.UTF-8): Pliki nagłówkowe biblioteki %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+Header files for %{name} library.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki %{name}.
+
+%prep
+%setup -q
+%patch0 -p1
+
+%build
+CXX="%{__cxx}" \
+CXXFLAGS="%{rpmcxxflags} %{rpmcppflags}" \
+LDFLAGS="%{rpmldflags}" \
+%{__make} \
+ LIBDIR="%{_lib}"
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+install -d $RPM_BUILD_ROOT%{_includedir}
+
+%{__make} install \
+ PREFIX=$RPM_BUILD_ROOT%{_prefix} \
+ LIBDIR="%{_lib}"
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%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
+
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/lib%{name}.so
+%{_includedir}/%{name}.h
diff --git a/makefile.patch b/makefile.patch
new file mode 100644
index 0000000..07091cf
--- /dev/null
+++ b/makefile.patch
@@ -0,0 +1,37 @@
+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 @@
+ 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`
+ LDLIBS +=
+
+@@ -39,21 +39,21 @@
+ CLXCLIENT_SO = libclxclient.so
+ CLXCLIENT_MAJ = $(CLXCLIENT_SO).$(MAJVERS)
+ CLXCLIENT_MIN = $(CLXCLIENT_MAJ).$(MINVERS)
+-CLXCLIENT_DEP = -lpthread -lXft -lX11
++CLXCLIENT_DEP = -lclthreads -lXft -lX11 -lpthread
+ 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)
+- ldconfig
++ /sbin/ldconfig -n -N $(PREFIX)/$(LIBDIR)
+ ln -sf $(CLXCLIENT_MIN) $(PREFIX)/$(LIBDIR)/$(CLXCLIENT_SO)
+
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/clxclient.git/commitdiff/8ee60b4b0581724c3d9c6cd928ded8a0f73d9dce
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
