From b0e902b924fb9d594d5779d98a1cf6d5082c54d8 Mon Sep 17 00:00:00 2001 From: pawelz Date: Fri, 23 Apr 2010 00:02:09 +0000 Subject: [PATCH] - Don't force specific jdk. Changed files: java-commons-daemon.spec -> 1.28 --- java-commons-daemon.spec | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/java-commons-daemon.spec b/java-commons-daemon.spec index 680e246..1b9baa9 100644 --- a/java-commons-daemon.spec +++ b/java-commons-daemon.spec @@ -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 -- 2.43.0