packages: java-jicmp/java-jicmp.spec - kill nonsense

glen glen at pld-linux.org
Tue May 19 14:39:15 CEST 2009


Author: glen                         Date: Tue May 19 12:39:15 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- kill nonsense

---- Files affected:
packages/java-jicmp:
   java-jicmp.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/java-jicmp/java-jicmp.spec
diff -u packages/java-jicmp/java-jicmp.spec:1.1 packages/java-jicmp/java-jicmp.spec:1.2
--- packages/java-jicmp/java-jicmp.spec:1.1	Tue May 19 12:14:16 2009
+++ packages/java-jicmp/java-jicmp.spec	Tue May 19 14:39:10 2009
@@ -6,16 +6,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}
@@ -32,15 +32,8 @@
 %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
@@ -62,6 +55,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2009/05/19 12:39:10  glen
+- kill nonsense
+
 Revision 1.1  2009/05/19 10:14:16  paszczus
 - initial
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-jicmp/java-jicmp.spec?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list