Author: pawelz Date: Sun Apr 18 15:06:17 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- don't force specific jdk
- unified
---- Files affected:
packages/java-jicmp:
java-jicmp.spec (1.2 -> 1.3)
---- Diffs:
================================================================
Index: packages/java-jicmp/java-jicmp.spec
diff -u packages/java-jicmp/java-jicmp.spec:1.2
packages/java-jicmp/java-jicmp.spec:1.3
--- packages/java-jicmp/java-jicmp.spec:1.2 Tue May 19 14:39:10 2009
+++ packages/java-jicmp/java-jicmp.spec Sun Apr 18 17:06:08 2010
@@ -1,25 +1,17 @@
# $Revision$, $Date$
-#
-%if "%{pld_release}" == "ti"
-%bcond_without java_sun # build with gcj
-%else
-%bcond_with java_sun # build with java-sun
-%endif
-%define pkg jicmp
+%define srcname jicmp
%include /usr/lib/rpm/macros.java
Summary: Java interface to ICMP (ping)
-Name: java-%{pkg}
+Name: java-%{srcname}
Version: 1.0.10
Release: 1
License: GPL
Group: Libraries/Java
-Source0: http://dl.sourceforge.net/opennms/%{pkg}-%{version}.tar.gz
+Source0:
http://downloads.sourceforge.net/opennms/%{srcname}-%{version}.tar.gz
# Source0-md5: 6473716859058697ae78a7d70c6aebbf
-%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires: java-sun}
-BuildRequires: rpm >= 4.4.9-56
+BuildRequires: jdk
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.300
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -29,7 +21,7 @@
written as a part of OpenNMS.
%prep
-%setup -q -n %{pkg}-%{version}
+%setup -q -n %{srcname}-%{version}
%build
export JAVA_HOME=%{java_home}
@@ -55,6 +47,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.3 2010/04/18 15:06:08 pawelz
+- don't force specific jdk
+- unified
+
Revision 1.2 2009/05/19 12:39:10 glen
- kill nonsense
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-jicmp/java-jicmp.spec?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
