summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElan Ruusamäe2009-05-19 12:39:10 (GMT)
committercvs2git2012-06-24 12:13:13 (GMT)
commit9ba2f65070033eeace1ca6f3cdb24d21c9cc37a3 (patch)
tree842db9d66011b1505adad7f6938e655419ee70c6
parent3a922547d3dd740a26ce8ef934139d745c072b13 (diff)
downloadjava-jicmp-9ba2f65070033eeace1ca6f3cdb24d21c9cc37a3.zip
java-jicmp-9ba2f65070033eeace1ca6f3cdb24d21c9cc37a3.tar.gz
- kill nonsense
Changed files: java-jicmp.spec -> 1.2
-rw-r--r--java-jicmp.spec15
1 files changed, 4 insertions, 11 deletions
diff --git a/java-jicmp.spec b/java-jicmp.spec
index f340e7d..01868fa 100644
--- a/java-jicmp.spec
+++ b/java-jicmp.spec
@@ -5,16 +5,16 @@
%bcond_with java_sun # build with java-sun
%endif
-%include /usr/lib/rpm/macros.java
-%define pkg jicmp
+%define pkg jicmp
+%include /usr/lib/rpm/macros.java
Summary: Java interface to ICMP (ping)
Name: java-%{pkg}
Version: 1.0.10
Release: 1
License: GPL
Group: Libraries/Java
-Source0: http://dl.sourceforge.net/opennms/jicmp-%{version}.tar.gz
+Source0: http://dl.sourceforge.net/opennms/%{pkg}-%{version}.tar.gz
# Source0-md5: 6473716859058697ae78a7d70c6aebbf
%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
%{?with_java_sun:BuildRequires: java-sun}
@@ -31,15 +31,8 @@ written as a part of OpenNMS.
%setup -q -n %{pkg}-%{version}
%build
-
-%ifnarch %(x8664)
-export JAVA_HOME="/usr/lib64/jvm/java"
-%else
-export JAVA_HOME="/usr/lib/jvm/java"
-%endif
-
+export JAVA_HOME=%{java_home}
%configure
-
%{__make}
%install