- Don't force specific jdk.
authorpawelz <pawelz@pld-linux.org>
Fri, 23 Apr 2010 00:02:09 +0000 (00:02 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    java-commons-daemon.spec -> 1.28

java-commons-daemon.spec

index 680e246810e1c63050c5d3f129154121eb5a16cc..1b9baa9bf534e16ad996e80e65d6f2bee1411652 100644 (file)
@@ -1,11 +1,5 @@
 # Conditional build:
 %bcond_without javadoc         # don't build javadoc
-%if "%{pld_release}" == "ti"
-%bcond_without java_sun        # build with gcj
-%else
-%bcond_with    java_sun        # build with java-sun
-%endif
-
 %include       /usr/lib/rpm/macros.java
 
 %define                srcname commons-daemon
@@ -22,11 +16,9 @@ Patch0:              jakarta-commons-daemon-link.patch
 URL:           http://commons.apache.org/daemon/
 BuildRequires: ant >= 1.4.1
 BuildRequires: automake
-%{!?with_java_sun:BuildRequires:       java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires:        java-sun}
+BuildRequires: jdk
 BuildRequires: jpackage-utils
 BuildRequires: junit >= 3.7
-BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpm-javaprov
 BuildRequires: rpmbuild(macros) >= 1.300
 BuildRequires: xmlto >= 0:0.0.18-1
This page took 0.087012 seconds and 4 git commands to generate.