Author: pawelz Date: Fri Apr 23 00:02:54 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- Don't force specific jdk.
---- Files affected:
packages/java-gnu-getopt:
java-gnu-getopt.spec (1.12 -> 1.13)
packages/java-ivy:
java-ivy.spec (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/java-gnu-getopt/java-gnu-getopt.spec
diff -u packages/java-gnu-getopt/java-gnu-getopt.spec:1.12
packages/java-gnu-getopt/java-gnu-getopt.spec:1.13
--- packages/java-gnu-getopt/java-gnu-getopt.spec:1.12 Fri Apr 3 14:47:33 2009
+++ packages/java-gnu-getopt/java-gnu-getopt.spec Fri Apr 23 02:02:45 2010
@@ -1,12 +1,6 @@
# $Revision$, $Date$
%bcond_without javadoc # don't build apidocs
-%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 gnu-getopt
Summary: Java getopt implementation
@@ -20,8 +14,7 @@
# Source0-md5: 46336d9bc055900f0320e5c378d7bfb2
URL: http://www.urbanophile.com/arenn/hacking/download.html
BuildRequires: ant >= 1.5
-%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires: java-sun}
+BuildRequires: jdk
BuildRequires: jpackage-utils
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.300
@@ -106,6 +99,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.13 2010/04/23 00:02:45 pawelz
+- Don't force specific jdk.
+
Revision 1.12 2009/04/03 12:47:33 pawelz
- changed name from gnu.getopt
- please, don't add P: gnu.getopt and don't link jar to old name.
================================================================
Index: packages/java-ivy/java-ivy.spec
diff -u packages/java-ivy/java-ivy.spec:1.1 packages/java-ivy/java-ivy.spec:1.2
--- packages/java-ivy/java-ivy.spec:1.1 Sun Jan 17 23:45:11 2010
+++ packages/java-ivy/java-ivy.spec Fri Apr 23 02:02:49 2010
@@ -4,12 +4,6 @@
%bcond_without javadoc # don't build javadoc
%bcond_without tests # don't build and run tests
-%if "%{pld_release}" == "ti"
-%bcond_without java_sun # build with gcj
-%else
-%bcond_with java_sun # build with java-sun
-%endif
-
%define srcname ivy
%include /usr/lib/rpm/macros.java
Summary: Java-based dependency manager
@@ -118,5 +112,8 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.2 2010/04/23 00:02:49 pawelz
+- Don't force specific jdk.
+
Revision 1.1 2010/01/17 22:45:11 glen
- new, based on fc spec
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-gnu-getopt/java-gnu-getopt.spec?r1=1.12&r2=1.13&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-ivy/java-ivy.spec?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
