[packages/loki] - up to 0.1.7

[baggins]

commit bdcbcb744acd1d51ba2a3bec876a5509ba538f12
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Jul 16 08:31:20 2022 +0200

    - up to 0.1.7

 loki.spec      | 15 +++++++++------
 multilib.patch | 28 ++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 6 deletions(-)
---
diff --git a/loki.spec b/loki.spec
index 6d99217..be35a92 100644
--- a/loki.spec
+++ b/loki.spec
@@ -1,14 +1,14 @@
-# TODO: optflags
 Summary:	Loki C++ Library
 Summary(pl.UTF-8):	Biblioteka Loki C++
 Name:		loki
-Version:	0.1.5
-Release:	0.1
+Version:	0.1.7
+Release:	1
 License:	MIT
 Group:		Libraries
-Source0:	http://dl.sourceforge.net/loki-lib/%{name}-%{version}.tar.gz
-# Source0-md5:	f246e9e91b46d4e55ce36193984697e6
-URL:		http://sourceforge.net/projects/loki-lib/
+Source0:	https://download.sourceforge.net/loki-lib/%{name}-%{version}.tar.bz2
+# Source0-md5:	33a24bcbb99fa2ec8fcbbab65649f3f6
+Patch0:		multilib.patch
+URL:		https://sourceforge.net/projects/loki-lib/
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -56,15 +56,18 @@ Dokumentacja HTML do biblioteki Loki C++.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__make} build-static build-shared \
+	CXXFLAGS="%{rpmcxxflags} -std=c++11" \
 	CC="%{__cc}" \
 	CXX="%{__cxx}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make} install \
+	libdir=%{_lib} \
 	prefix=$RPM_BUILD_ROOT%{_prefix}
 
 %clean
diff --git a/multilib.patch b/multilib.patch
new file mode 100644
index 0000000..4d1be82
--- /dev/null
+++ b/multilib.patch
@@ -0,0 +1,28 @@
+--- loki-0.1.7/Makefile.common~	2007-05-29 04:26:26.000000000 +0200
++++ loki-0.1.7/Makefile.common	2022-07-16 08:28:09.963817228 +0200
+@@ -5,3 +5,4 @@
+ CXXFLAGS := $(CXXWARNFLAGS) -g -O2
+ 
+ prefix := /usr
++libdir := lib
+--- loki-0.1.7/src/Makefile~	2009-01-26 20:45:54.000000000 +0100
++++ loki-0.1.7/src/Makefile	2022-07-16 08:29:11.657266243 +0200
+@@ -74,13 +74,13 @@
+ install: install-static install-shared
+ 
+ install-static: $(RESULT_DIR)$(STATIC_LIB)
+-	mkdir -p $(prefix)/lib
+-	$(INSTALL_DATA) $(RESULT_DIR)$(STATIC_LIB) $(prefix)/lib
++	mkdir -p $(prefix)/$(libdir)
++	$(INSTALL_DATA) $(RESULT_DIR)$(STATIC_LIB) $(prefix)/$(libdir)
+ 
+ install-shared: $(RESULT_DIR)$(SHARED_LIB_VERSIONED)
+-	mkdir -p $(prefix)/lib
+-	$(INSTALL_DATA) $(RESULT_DIR)$(SHARED_LIB_VERSIONED) $(prefix)/lib
+-	cd $(prefix)/lib; ln -s $(SHARED_LIB_VERSIONED) $(SHARED_LIB_BASE)
++	mkdir -p $(prefix)/$(libdir)
++	$(INSTALL_DATA) $(RESULT_DIR)$(SHARED_LIB_VERSIONED) $(prefix)/$(libdir)
++	cd $(prefix)/$(libdir); ln -s $(SHARED_LIB_VERSIONED) $(SHARED_LIB_BASE)
+ 
+ %.lo : %.cpp
+ 	$(CXX) -c $(CXXFLAGS) -fPIC $(CPPFLAGS) -o $@ $<
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/loki.git/commitdiff/bdcbcb744acd1d51ba2a3bec876a5509ba538f12