Author: pawelz Date: Fri Apr 23 00:03:18 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- Don't force specific jdk.
---- Files affected:
packages/java-jgoodies-forms:
java-jgoodies-forms.spec (1.3 -> 1.4)
packages/java-jgoodies-looks:
java-jgoodies-looks.spec (1.3 -> 1.4)
---- Diffs:
================================================================
Index: packages/java-jgoodies-forms/java-jgoodies-forms.spec
diff -u packages/java-jgoodies-forms/java-jgoodies-forms.spec:1.3
packages/java-jgoodies-forms/java-jgoodies-forms.spec:1.4
--- packages/java-jgoodies-forms/java-jgoodies-forms.spec:1.3 Sun Apr 4
14:15:36 2010
+++ packages/java-jgoodies-forms/java-jgoodies-forms.spec Fri Apr 23
02:03:09 2010
@@ -3,12 +3,6 @@
# 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
-
%define shortname forms
%define srcname jgoodies-%{shortname}
%define ver %(echo %{version} | tr . _)
@@ -24,10 +18,8 @@
# Source0-md5: 756de0bee840592cdc12ef0cd5d8332e
Patch0: build.patch
BuildRequires: ant
-%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires: java-sun}
+BuildRequires: jdk
BuildRequires: jpackage-utils >= 1.6
-BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.533
BuildRequires: sed >= 4.0
@@ -162,6 +154,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.4 2010/04/23 00:03:09 pawelz
+- Don't force specific jdk.
+
Revision 1.3 2010/04/04 12:15:36 glen
- ghost javadoc symlink; rel 3
================================================================
Index: packages/java-jgoodies-looks/java-jgoodies-looks.spec
diff -u packages/java-jgoodies-looks/java-jgoodies-looks.spec:1.3
packages/java-jgoodies-looks/java-jgoodies-looks.spec:1.4
--- packages/java-jgoodies-looks/java-jgoodies-looks.spec:1.3 Sun Apr 4
17:16:06 2010
+++ packages/java-jgoodies-looks/java-jgoodies-looks.spec Fri Apr 23
02:03:13 2010
@@ -22,10 +22,8 @@
Patch2: remove-jdk-stuff.patch
Patch3: demo-manifest.patch
BuildRequires: ant
-%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires: java-sun}
+BuildRequires: jdk
BuildRequires: jpackage-utils >= 1.6
-BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.553
BuildRequires: sed >= 4.0
@@ -169,6 +167,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.4 2010/04/23 00:03:13 pawelz
+- Don't force specific jdk.
+
Revision 1.3 2010/04/04 15:16:06 pawelz
- use %undos instead of sed (since rpm-b-m-1.553 it works with '| xargs')
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-jgoodies-forms/java-jgoodies-forms.spec?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-jgoodies-looks/java-jgoodies-looks.spec?r1=1.3&r2=1.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
