[packages/umlinux-tools] - fix libdir location - rel 4

[baggins]

commit 02c18840a0e465336d88e089e4f6201a8056843f
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Oct 22 23:43:14 2016 +0200

    - fix libdir location
    - rel 4

 no-hardcoded-libdir.patch | 17 +++++++++++++++++
 umlinux-tools.spec        | 10 +++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)
---
diff --git a/umlinux-tools.spec b/umlinux-tools.spec
index 1e2d41b..fad568d 100644
--- a/umlinux-tools.spec
+++ b/umlinux-tools.spec
@@ -2,12 +2,13 @@ Summary:	User Mode Linux tools
 Summary(pl.UTF-8):	Narzędzia dla Linuksa w przestrzeni użytkownika
 Name:		umlinux-tools
 Version:	20070815
-Release:	3
+Release:	4
 License:	GPL v2
 Group:		Applications/Emulators
 Source0:	http://user-mode-linux.sourceforge.net/uml_utilities_%{version}.tar.bz2
 # Source0-md5:	b0468ac8b79cef53f36f5f9517907462
 Patch0:		%{name}-Makefile.patch
+Patch1:		no-hardcoded-libdir.patch
 URL:		http://user-mode-linux.sourceforge.net/
 BuildRequires:	libfuse-devel
 BuildRequires:	ncurses-devel
@@ -23,18 +24,21 @@ Narzędzia dla Linuksa w przestrzeni użytkownika.
 %prep
 %setup -q -n tools-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__make} \
 	CC="%{__cc}" \
 	CFLAGS="%{rpmcflags} -Wall" \
-	LDFLAGS="%{rpmldflags}"
+	LDFLAGS="%{rpmldflags}" \
+	LIB_DIR=%{_libdir}/uml
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	LIB_DIR=%{_libdir}/uml
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff --git a/no-hardcoded-libdir.patch b/no-hardcoded-libdir.patch
new file mode 100644
index 0000000..952bd5e
--- /dev/null
+++ b/no-hardcoded-libdir.patch
@@ -0,0 +1,17 @@
+--- tools-20070815/Makefile~	2016-10-22 23:38:58.000000000 +0200
++++ tools-20070815/Makefile	2016-10-22 23:39:13.382804614 +0200
+@@ -6,13 +6,7 @@
+ TARBALL = uml_utilities_$(UMLVER).tar.bz2
+ BIN_DIR = /usr/bin
+ 
+-ifeq ($(shell uname -m),x86_64)
+-LIB_DIR = /usr/lib64/uml
+-else
+-LIB_DIR = /usr/lib/uml
+-endif
+-
+-export BIN_DIR LIB_DIR CFLAGS
++export BIN_DIR CFLAGS
+ 
+ all install: 
+ 	set -e ; for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@; done
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/umlinux-tools.git/commitdiff/02c18840a0e465336d88e089e4f6201a8056843f