[packages/wb] - fixed install without dotnet; added java bcond
qboosh
qboosh at pld-linux.org
Fri Jul 29 21:14:57 CEST 2016
commit 9bd08f656f34758b6c1638a9646766e77763c7d6
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Jul 29 21:15:32 2016 +0200
- fixed install without dotnet; added java bcond
wb.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/wb.spec b/wb.spec
index 430738e..e2f1648 100644
--- a/wb.spec
+++ b/wb.spec
@@ -1,6 +1,7 @@
#
# Conditional build:
%bcond_without dotnet # C# package
+%bcond_without java # Java package
#
%ifnarch %{ix86} %{x8664} arm aarch64 ia64 mips ppc ppc64 s390x sparc sparcv9 sparc64
%undefine with_dotnet
@@ -116,7 +117,7 @@ Biblioteka WB dla Javy.
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
+%{__make} installc install-info %{?with_dotnet:installdll} %{?with_java:installjar} \
DESTDIR=$RPM_BUILD_ROOT
# let rpm autogenerate dependencies
@@ -161,6 +162,8 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/Wb.dll
%endif
+%if %{with java}
%files -n java-wb
%defattr(644,root,root,755)
%{_javadir}/wb.jar
+%endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/wb.git/commitdiff/9bd08f656f34758b6c1638a9646766e77763c7d6
More information about the pld-cvs-commit
mailing list