packages: ApacheDirectoryStudio/ApacheDirectoryStudio.spec, JXplorer/JXplor...

jajcus jajcus at pld-linux.org
Sat Apr 17 09:44:31 CEST 2010 

Author: jajcus                       Date: Sat Apr 17 07:44:31 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- do not pull java-sun via BR - icedtea6 should be enough in all (most) cases

---- Files affected:
packages/ApacheDirectoryStudio:
   ApacheDirectoryStudio.spec (1.13 -> 1.14) 
packages/JXplorer:
   JXplorer.spec (1.10 -> 1.11) 
packages/antlr3:
   antlr3.spec (1.4 -> 1.5) 
packages/fedora-idm-console:
   fedora-idm-console.spec (1.1 -> 1.2) 
packages/geogebra:
   geogebra.spec (1.2 -> 1.3) 
packages/glassfish:
   glassfish.spec (1.5 -> 1.6) 
packages/java-avalon-framework:
   java-avalon-framework.spec (1.19 -> 1.20) 
packages/java-geronimo-spec-jaxrpc:
   java-geronimo-spec-jaxrpc.spec (1.5 -> 1.6) 
packages/java-saaj:
   java-saaj.spec (1.4 -> 1.5) 
packages/java-xml-commons:
   java-xml-commons.spec (1.29 -> 1.30) 
packages/java-xmlgraphics-batik:
   java-xmlgraphics-batik.spec (1.37 -> 1.38) 

---- Diffs:

================================================================
Index: packages/ApacheDirectoryStudio/ApacheDirectoryStudio.spec
diff -u packages/ApacheDirectoryStudio/ApacheDirectoryStudio.spec:1.13 packages/ApacheDirectoryStudio/ApacheDirectoryStudio.spec:1.14
--- packages/ApacheDirectoryStudio/ApacheDirectoryStudio.spec:1.13	Wed Mar 31 08:45:23 2010
+++ packages/ApacheDirectoryStudio/ApacheDirectoryStudio.spec	Sat Apr 17 09:44:26 2010
@@ -15,7 +15,7 @@
 Source2:	apachedirectorystudio.desktop
 URL:		http://directory.apache.org/studio/
 BuildRequires:	rpmbuild(macros) >= 1.300
-Requires:	java-sun-jre
+Requires:	jre-X11
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -68,6 +68,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2010/04/17 07:44:26  jajcus
+- do not pull java-sun via BR - icedtea6 should be enough in all (most) cases
+
 Revision 1.13  2010/03/31 06:45:23  paszczus
 - updated to 1.5.2
 

================================================================
Index: packages/JXplorer/JXplorer.spec
diff -u packages/JXplorer/JXplorer.spec:1.10 packages/JXplorer/JXplorer.spec:1.11
--- packages/JXplorer/JXplorer.spec:1.10	Fri Feb 12 17:04:05 2010
+++ packages/JXplorer/JXplorer.spec	Sat Apr 17 09:44:26 2010
@@ -19,7 +19,7 @@
 BuildRequires:	ant
 BuildRequires:	icoutils
 BuildRequires:	jar
-BuildRequires:	java-sun
+BuildRequires:	jdk
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
@@ -134,6 +134,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2010/04/17 07:44:26  jajcus
+- do not pull java-sun via BR - icedtea6 should be enough in all (most) cases
+
 Revision 1.10  2010/02/12 16:04:05  pawelz
 - BR: java-sun, yet another app that does not build with broken RMS' something-like-java-compiler.
 

================================================================
Index: packages/antlr3/antlr3.spec
diff -u packages/antlr3/antlr3.spec:1.4 packages/antlr3/antlr3.spec:1.5
--- packages/antlr3/antlr3.spec:1.4	Tue Oct 13 15:42:21 2009
+++ packages/antlr3/antlr3.spec	Sat Apr 17 09:44:26 2010
@@ -26,7 +26,7 @@
 URL:		http://antlr.org/
 %if %{with ant}
 BuildRequires:	ant
-BuildRequires:	java-sun
+BuildRequires:	jdk
 %endif
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
@@ -103,6 +103,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2010/04/17 07:44:26  jajcus
+- do not pull java-sun via BR - icedtea6 should be enough in all (most) cases
+
 Revision 1.4  2009/10/13 13:42:21  pawelz
 - it does not build with gcj.
 

================================================================
Index: packages/fedora-idm-console/fedora-idm-console.spec
diff -u packages/fedora-idm-console/fedora-idm-console.spec:1.1 packages/fedora-idm-console/fedora-idm-console.spec:1.2
--- packages/fedora-idm-console/fedora-idm-console.spec:1.1	Mon Jun  9 18:32:43 2008
+++ packages/fedora-idm-console/fedora-idm-console.spec	Sat Apr 17 09:44:27 2010
@@ -15,7 +15,7 @@
 BuildRequires:	jss >= 4.2
 BuildRequires:	ldapsdk
 Requires:	idm-console-framework >= 1.1
-Requires:	java-sun-jre-X11
+Requires:	jre-X11
 Requires:	which
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -61,6 +61,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2010/04/17 07:44:27  jajcus
+- do not pull java-sun via BR - icedtea6 should be enough in all (most) cases
+
 Revision 1.1  2008/06/09 16:32:43  adamg
 - new
 

================================================================
Index: packages/geogebra/geogebra.spec
diff -u packages/geogebra/geogebra.spec:1.2 packages/geogebra/geogebra.spec:1.3
--- packages/geogebra/geogebra.spec:1.2	Sat Jan 16 16:26:42 2010
+++ packages/geogebra/geogebra.spec	Sat Apr 17 09:44:28 2010
@@ -23,7 +23,7 @@
 Source12:	http://aur.archlinux.org/packages/geogebra/geogebra/%{name}.png
 # Source12-md5:	e324ee3a2bb438cee625e3f29770a315
 URL:		http://www.geogebra.org
-Requires:	java-sun-jre >= 1.4.2
+Requires:	jre >= 1.4.2
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -64,6 +64,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2010/04/17 07:44:28  jajcus
+- do not pull java-sun via BR - icedtea6 should be enough in all (most) cases
+
 Revision 1.2  2010/01/16 15:26:42  sparky
 - BA: noarch
 

================================================================
Index: packages/glassfish/glassfish.spec
diff -u packages/glassfish/glassfish.spec:1.5 packages/glassfish/glassfish.spec:1.6
--- packages/glassfish/glassfish.spec:1.5	Thu Jan  7 14:45:34 2010
+++ packages/glassfish/glassfish.spec	Sat Apr 17 09:44:28 2010
@@ -25,7 +25,7 @@
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
-Requires:	java-sun-jre >= 1.6.0.17
+Requires:	jre >= 1.6.0.17
 Provides:	group(glassfish)
 Provides:	user(glassfish)
 BuildArch:	noarch
@@ -115,6 +115,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2010/04/17 07:44:28  jajcus
+- do not pull java-sun via BR - icedtea6 should be enough in all (most) cases
+
 Revision 1.5  2010/01/07 13:45:34  pawelz
 - package javadb and mq
 - drop NoSource: 0

================================================================
Index: packages/java-avalon-framework/java-avalon-framework.spec
diff -u packages/java-avalon-framework/java-avalon-framework.spec:1.19 packages/java-avalon-framework/java-avalon-framework.spec:1.20
--- packages/java-avalon-framework/java-avalon-framework.spec:1.19	Sun Apr  4 00:36:51 2010
+++ packages/java-avalon-framework/java-avalon-framework.spec	Sat Apr 17 09:44:29 2010
@@ -25,7 +25,8 @@
 BuildRequires:	java-commons-logging
 %{?with_tests:BuildRequires:	java-junit}
 BuildRequires:	java-log4j
-BuildRequires:	java-sun
+BuildRequires:	jdk
+BuildConflicts:	java-gcj-compat-devel
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
@@ -91,6 +92,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2010/04/17 07:44:29  jajcus
+- do not pull java-sun via BR - icedtea6 should be enough in all (most) cases
+
 Revision 1.19  2010/04/03 22:36:51  pawelz
 - G: Libraries/Java
 - O: avalon-framework

================================================================
Index: packages/java-geronimo-spec-jaxrpc/java-geronimo-spec-jaxrpc.spec
diff -u packages/java-geronimo-spec-jaxrpc/java-geronimo-spec-jaxrpc.spec:1.5 packages/java-geronimo-spec-jaxrpc/java-geronimo-spec-jaxrpc.spec:1.6
--- packages/java-geronimo-spec-jaxrpc/java-geronimo-spec-jaxrpc.spec:1.5	Fri Aug 21 09:46:55 2009
+++ packages/java-geronimo-spec-jaxrpc/java-geronimo-spec-jaxrpc.spec	Sat Apr 17 09:44:29 2010
@@ -14,7 +14,7 @@
 URL:		http://svn.clazzes.org/svn/odtransform/
 BuildRequires:	jar
 BuildRequires:	java(Servlet)
-BuildRequires:	java-sun
+BuildRequires:	jdk
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	java(Servlet)
@@ -56,6 +56,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2010/04/17 07:44:29  jajcus
+- do not pull java-sun via BR - icedtea6 should be enough in all (most) cases
+
 Revision 1.5  2009/08/21 07:46:55  pawelz
 - unified java deps and required jar names
 - rel 2

================================================================
Index: packages/java-saaj/java-saaj.spec
diff -u packages/java-saaj/java-saaj.spec:1.4 packages/java-saaj/java-saaj.spec:1.5
--- packages/java-saaj/java-saaj.spec:1.4	Mon Mar 30 14:44:04 2009
+++ packages/java-saaj/java-saaj.spec	Sat Apr 17 09:44:30 2010
@@ -12,7 +12,8 @@
 Source0:	https://saaj.dev.java.net/files/documents/52/125659/saaj%{version}.src.zip
 # Source0-md5:	11eb6e620f65bced00471dc5388c4dad
 URL:		https://saaj.dev.java.net/
-BuildRequires:	java-sun
+BuildRequires:	jdk
+BuildConflicts: java-gcj-compat-devel
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
@@ -91,6 +92,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2010/04/17 07:44:30  jajcus
+- do not pull java-sun via BR - icedtea6 should be enough in all (most) cases
+
 Revision 1.4  2009/03/30 12:44:04  paszczus
 - dropped EA
 

================================================================
Index: packages/java-xml-commons/java-xml-commons.spec
diff -u packages/java-xml-commons/java-xml-commons.spec:1.29 packages/java-xml-commons/java-xml-commons.spec:1.30
--- packages/java-xml-commons/java-xml-commons.spec:1.29	Tue Mar 31 17:28:34 2009
+++ packages/java-xml-commons/java-xml-commons.spec	Sat Apr 17 09:44:30 2010
@@ -30,7 +30,7 @@
 BuildRequires:	java-sun
 %else
 BuildRequires:	ant >= 1.7.1-3
-BuildRequires:	java-gcj-compat-devel
+BuildRequires:	jdk
 %endif
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm >= 4.4.9-56
@@ -119,6 +119,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30  2010/04/17 07:44:30  jajcus
+- do not pull java-sun via BR - icedtea6 should be enough in all (most) cases
+
 Revision 1.29  2009/03/31 15:28:34  pawelz
 - Apache license version
 - versioned ant R needed only when building with gcj

================================================================
Index: packages/java-xmlgraphics-batik/java-xmlgraphics-batik.spec
diff -u packages/java-xmlgraphics-batik/java-xmlgraphics-batik.spec:1.37 packages/java-xmlgraphics-batik/java-xmlgraphics-batik.spec:1.38
--- packages/java-xmlgraphics-batik/java-xmlgraphics-batik.spec:1.37	Sat Apr  3 22:32:28 2010
+++ packages/java-xmlgraphics-batik/java-xmlgraphics-batik.spec	Sat Apr 17 09:44:30 2010
@@ -22,14 +22,14 @@
 Patch0:		%{name}-nodocs.patch
 URL:		http://xml.apache.org/batik/
 %{?with_doc:BuildRequires:	java-forrest}
-BuildRequires:	java-sun >= 1.4
+BuildRequires:	jdk >= 1.4
 BuildRequires:	java-xalan
 %{!?with_bootstrap:BuildRequires:	java-xmlgraphics-fop}
 BuildRequires:	jpackage-utils
 BuildRequires:	rhino
 BuildRequires:	unzip
 BuildRequires:	xml-commons-external
-Requires:	java-sun-jre >= 1.4
+Requires:	jre >= 1.4
 Requires:	java-xalan
 Requires:	rhino
 Requires:	xml-commons-external
@@ -126,6 +126,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38  2010/04/17 07:44:30  jajcus
+- do not pull java-sun via BR - icedtea6 should be enough in all (most) cases
+
 Revision 1.37  2010/04/03 20:32:28  pawelz
 - rel 6 (to send to th without bootstrap)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ApacheDirectoryStudio/ApacheDirectoryStudio.spec?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/JXplorer/JXplorer.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/antlr3/antlr3.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fedora-idm-console/fedora-idm-console.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/geogebra/geogebra.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/glassfish/glassfish.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-avalon-framework/java-avalon-framework.spec?r1=1.19&r2=1.20&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-geronimo-spec-jaxrpc/java-geronimo-spec-jaxrpc.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-saaj/java-saaj.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-xml-commons/java-xml-commons.spec?r1=1.29&r2=1.30&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-xmlgraphics-batik/java-xmlgraphics-batik.spec?r1=1.37&r2=1.38&f=u

More information about the pld-cvs-commit mailing list