[leveldbjni] introduce license macro
gil
gil at fedoraproject.org
Tue Feb 10 20:02:08 UTC 2015
commit f75e4a07995fed6280d9d7db575365517b9d2663
Author: gil <puntogil at libero.it>
Date: Tue Feb 10 21:01:53 2015 +0100
introduce license macro
leveldbjni.spec | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
---
diff --git a/leveldbjni.spec b/leveldbjni.spec
index cd78777..b8d5e78 100644
--- a/leveldbjni.spec
+++ b/leveldbjni.spec
@@ -1,11 +1,5 @@
%global debug_package %{nil}
-%if %{__isa_bits} == 64
-%global bits 64
-%else
-%global bits 32
-%endif
-
Name: leveldbjni
Version: 1.8
Release: 7%{?dist}
@@ -80,7 +74,7 @@ This package contains javadoc for %{name}.
%pom_xpath_remove "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-bundle-plugin']/pom:configuration/pom:instructions/pom:Bundle-NativeCode" %{name}-all
-%if %{bits} == 64
+%if %{__isa_bits} == 64
%pom_remove_dep org.fusesource.%{name}:%{name}-linux32 %{name}-all
%pom_xpath_inject "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-bundle-plugin']/pom:configuration/pom:instructions" "
@@ -103,14 +97,13 @@ cp -f /usr/lib/rpm/config.{sub,guess} leveldbjni/src/main/native-package/autotoo
%build
-# ppc64 ppc64p7 ppc64le
-%ifarch %power64
+%if %{__isa_bits} == 64
export MAVEN_OPTS='-Xms1024m -Xmx2048m -XX:MaxPermSize=384m'
%endif
%mvn_file :%{name}-all %{name}-all
-%mvn_file :%{name}-linux%{bits} %{name}-linux
+%mvn_file :%{name}-linux%{__isa_bits} %{name}-linux
export JAVA_HOME=%{_jvmdir}/java LEVELDB_HOME=%{_prefix} SNAPPY_HOME=%{_prefix}
-%mvn_build -- -Plinux%{bits},all -Dleveldb=%{_prefix} -Dsnappy=%{_prefix}
+%mvn_build -- -Plinux%{__isa_bits},all -Dleveldb=%{_prefix} -Dsnappy=%{_prefix}
%install
%mvn_install
More information about the scm-commits
mailing list