[leveldbjni] introduce license macro

gil gil at fedoraproject.org
Fri Feb 13 22:24:18 UTC 2015


commit 8250fa4ebc6c92d74a9df0af887b3b8a48d8c14e
Author: gil <puntogil at libero.it>
Date:   Fri Feb 13 23:23:52 2015 +0100

    introduce license macro

 leveldbjni.spec |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/leveldbjni.spec b/leveldbjni.spec
index 3db7398..fecc132 100644
--- a/leveldbjni.spec
+++ b/leveldbjni.spec
@@ -1,9 +1,12 @@
 %global debug_package %{nil}
 
-%if %{__isa_bits} == 64
-%global bits 64
+# rpmbuild < 4.6 support
+%if ! 0%{?__isa_bits}
+%ifarch x86_64 ia64 ppc64 sparc64 s390x alpha ppc64le aarch64
+%global __isa_bits 64
 %else
-%global bits 32
+%global __isa_bits 32
+%endif
 %endif
 
 Name:          leveldbjni
@@ -80,7 +83,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" "
@@ -109,7 +112,7 @@ export MAVEN_OPTS='-Xms1024m -Xmx2048m -XX:MaxPermSize=384m'
 %mvn_file :%{name}-all %{name}-all
 %mvn_file :%{name}-linux%{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