[packages/Wnn6-SDK] - don't use multilevel setup -n, it breaks post-build cleanup

qboosh qboosh at pld-linux.org
Sun Apr 10 21:43:25 CEST 2016


commit 8446aa233ec31efef0a75526a74066947b43d583
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Apr 10 21:43:27 2016 +0200

    - don't use multilevel setup -n, it breaks post-build cleanup

 Wnn6-SDK.spec | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/Wnn6-SDK.spec b/Wnn6-SDK.spec
index fafabb8..4f89232 100644
--- a/Wnn6-SDK.spec
+++ b/Wnn6-SDK.spec
@@ -3,7 +3,7 @@ Summary(pl.UTF-8):	Biblioteka kliencka Wnn6
 Name:		Wnn6-SDK
 Version:	1.0
 Release:	11
-License:	Copyright (C) OMRON Corporation, OMRON Software Co., Ltd. (see README)
+License:	OMRON Corporation (distributable, see README)
 Group:		Libraries
 #Source0Download: http://www.omronsoft.co.jp/SP/pcunix/sdk/
 Source0:	http://www.omronsoft.co.jp/SP/pcunix/sdk/wnn/%{name}.tar.gz
@@ -49,7 +49,8 @@ Static Wnn6 client library.
 Statyczna biblioteka kliencka Wnn6.
 
 %prep
-%setup -q -n src/contrib/im/Xsi
+%setup -q -c
+cd src/contrib/im/Xsi
 %patch0 -p4
 %patch1 -p1
 %patch2 -p1
@@ -62,7 +63,7 @@ Statyczna biblioteka kliencka Wnn6.
 	config/X11.tmpl Makefile.ini
 
 %build
-%{__make} World -f Makefile.ini \
+%{__make} -C src/contrib/im/Xsi -f Makefile.ini World \
 	WNNLIBDIR=%{_libdir} \
 	CC="%{__cc}" \
 	CDEBUGFLAGS="%{rpmcflags} -fPIC" \
@@ -71,7 +72,7 @@ Statyczna biblioteka kliencka Wnn6.
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} -C src/contrib/im/Xsi install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 %clean
@@ -82,7 +83,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README
+%doc src/contrib/im/Xsi/README
 %attr(755,root,root) %{_libdir}/libwnn6.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libwnn6.so.1
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/Wnn6-SDK.git/commitdiff/8446aa233ec31efef0a75526a74066947b43d583



More information about the pld-cvs-commit mailing list