Author: pawelz Date: Fri Apr 23 00:04:14 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- Don't force specific jdk.
---- Files affected:
packages/odtransform:
odtransform.spec (1.26 -> 1.27)
packages/opengrok:
opengrok.spec (1.2 -> 1.3)
---- Diffs:
================================================================
Index: packages/odtransform/odtransform.spec
diff -u packages/odtransform/odtransform.spec:1.26
packages/odtransform/odtransform.spec:1.27
--- packages/odtransform/odtransform.spec:1.26 Sun Apr 4 00:04:32 2010
+++ packages/odtransform/odtransform.spec Fri Apr 23 02:04:05 2010
@@ -1,12 +1,6 @@
# $Revision$, $Date$
#
# Conditional build:
-%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 snap 19
@@ -26,7 +20,6 @@
URL: http://svn.clazzes.org/svn/odtransform/
BuildRequires: jar
BuildRequires: java-commons-logging
-%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
%{?with_java_sun:BuildRequires: java-sun >= 1.5}
BuildRequires: jpackage-utils
BuildRequires: rpm-javaprov
@@ -91,6 +84,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.27 2010/04/23 00:04:05 pawelz
+- Don't force specific jdk.
+
Revision 1.26 2010/04/03 22:04:32 pawelz
- unified jdk bconds
- better Group: Applications/Publishing/XML/Java
================================================================
Index: packages/opengrok/opengrok.spec
diff -u packages/opengrok/opengrok.spec:1.2 packages/opengrok/opengrok.spec:1.3
--- packages/opengrok/opengrok.spec:1.2 Fri May 8 13:29:33 2009
+++ packages/opengrok/opengrok.spec Fri Apr 23 02:04:09 2010
@@ -1,12 +1,6 @@
# $Revision$, $Date$
#
# Conditional build:
-%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
Summary: A wicked fast source browser
Name: opengrok
@@ -20,11 +14,10 @@
BuildRequires: ant
BuildRequires: ant-nodeps
BuildRequires: jakarta-bcel >= 5.1
-%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
BuildRequires: java-lucene
BuildRequires: java-oro
BuildRequires: java-servletapi5
-%{?with_java_sun:BuildRequires: java-sun}
+BuildRequires: jdk
BuildRequires: jflex
BuildRequires: jpackage-utils
BuildRequires: rpm-javaprov
@@ -104,6 +97,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.3 2010/04/23 00:04:09 pawelz
+- Don't force specific jdk.
+
Revision 1.2 2009/05/08 11:29:33 glen
- building (old changes)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/odtransform/odtransform.spec?r1=1.26&r2=1.27&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/opengrok/opengrok.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
