SPECS: ant.spec, aspectwerkz.spec, castor.spec, eclipse.spec, jaka...

glen glen at pld-linux.org
Sun May 21 22:24:35 CEST 2006 

Author: glen                         Date: Sun May 21 20:24:35 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use rpm-javaprov

---- Files affected:
SPECS:
   ant.spec (1.53 -> 1.54) , aspectwerkz.spec (1.3 -> 1.4) , castor.spec (1.3 -> 1.4) , eclipse.spec (1.64 -> 1.65) , jakarta-log4j.spec (1.25 -> 1.26) , java-gnu-mail.spec (1.4 -> 1.5) , java-sun.spec (1.136 -> 1.137) , jython.spec (1.17 -> 1.18) , qdox.spec (1.3 -> 1.4) , statcvs.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/ant.spec
diff -u SPECS/ant.spec:1.53 SPECS/ant.spec:1.54
--- SPECS/ant.spec:1.53	Sun May 21 20:03:55 2006
+++ SPECS/ant.spec	Sun May 21 22:24:29 2006
@@ -62,10 +62,10 @@
 %{?with_javamail:BuildRequires:	javamail}
 BuildRequires:	jaxp_parser_impl
 BuildRequires:	jdk
-BuildRequires:	jpackage-utils >= 0:1.6.6-3
 %{?with_jsch:BuildRequires:	jsch}
 %{?with_junit:BuildRequires:	junit}
 %{?with_bsf:BuildRequires:	jython}
+BuildRequires:	rpm-javaprov
 BuildRequires:	rpm-pythonprov
 Requires:	jdk
 Requires:	jpackage-utils
@@ -759,6 +759,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.54  2006/05/21 20:24:29  glen
+- use rpm-javaprov
+
 Revision 1.53  2006/05/21 18:03:55  jajcus
 - R: jpackage-utils >= 0:1.6.6-3 (so unset $JAVA_HOME is really not needed)
 

================================================================
Index: SPECS/aspectwerkz.spec
diff -u SPECS/aspectwerkz.spec:1.3 SPECS/aspectwerkz.spec:1.4
--- SPECS/aspectwerkz.spec:1.3	Fri May 19 13:28:19 2006
+++ SPECS/aspectwerkz.spec	Sun May 21 22:24:29 2006
@@ -11,21 +11,21 @@
 Patch0:		%{name}2-build_xml.patch
 Patch1:		%{name}2-script.patch
 URL:		http://aspectwerkz.codehaus.org/
+BuildRequires:	ant >= 1.6
 BuildRequires:	asm
 BuildRequires:	concurrent
 BuildRequires:	dom4j
 BuildRequires:	gnu.trove
-BuildRequires:	ant >= 1.6
 BuildRequires:	jarjar
 BuildRequires:	java-1.4.2-bea
 BuildRequires:	java-1.5.0-sun-devel
 BuildRequires:	javassist
-#BuildRequires:	jpackage-utils >= 0:1.6
 BuildRequires:	jrexx
 BuildRequires:	junit
 BuildRequires:	junitperf
 BuildRequires:	piccolo
 BuildRequires:	qdox
+#BuildRequires:	rpm-javaprov
 Requires:	concurrent
 Requires:	dom4j
 Requires:	gnu.trove
@@ -214,6 +214,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2006/05/21 20:24:29  glen
+- use rpm-javaprov
+
 Revision 1.3  2006/05/19 11:28:19  jajcus
 - s/jakarta-ant/ant/ in BR
 

================================================================
Index: SPECS/castor.spec
diff -u SPECS/castor.spec:1.3 SPECS/castor.spec:1.4
--- SPECS/castor.spec:1.3	Fri May 19 13:28:19 2006
+++ SPECS/castor.spec	Sun May 21 22:24:29 2006
@@ -10,17 +10,17 @@
 # Source0-md5:	3ec1b9623f04b86f157738bd3f10a847
 URL:		http://castor.codehaus.org/
 BuildRequires:	adaptx
-BuildRequires:	cglib
 BuildRequires:	ant
+BuildRequires:	cglib
 BuildRequires:	jakarta-oro
 BuildRequires:	jakarta-regexp
 BuildRequires:	jdbc-stdext
 BuildRequires:	jdk
 BuildRequires:	jndi
-#BuildRequires:	jpackage-utils >= 0:1.5.39
 BuildRequires:	jta
 BuildRequires:	junit
 BuildRequires:	ldapsdk
+#BuildRequires:	rpm-javaprov
 BuildRequires:	xerces-j
 Requires:	adaptx
 Requires:	cglib
@@ -177,6 +177,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2006/05/21 20:24:29  glen
+- use rpm-javaprov
+
 Revision 1.3  2006/05/19 11:28:19  jajcus
 - s/jakarta-ant/ant/ in BR
 

================================================================
Index: SPECS/eclipse.spec
diff -u SPECS/eclipse.spec:1.64 SPECS/eclipse.spec:1.65
--- SPECS/eclipse.spec:1.64	Sat May 20 20:58:32 2006
+++ SPECS/eclipse.spec	Sun May 21 22:24:29 2006
@@ -29,10 +29,10 @@
 BuildRequires:	ant >= 1.6.1
 BuildRequires:	jdk >= 1.4
 BuildRequires:	pkgconfig
+BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.213
 BuildRequires:	unzip
 BuildRequires:	zip
-BuildRequires:	jpackage-utils
 Requires:	ant
 Requires:	jdk >= 1.4
 Obsoletes:	eclipse-SDK
@@ -257,6 +257,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.65  2006/05/21 20:24:29  glen
+- use rpm-javaprov
+
 Revision 1.64  2006/05/20 18:58:32  jajcus
 - use jpackage-utils for build. No hardcoded JAVA_HOME.
 

================================================================
Index: SPECS/jakarta-log4j.spec
diff -u SPECS/jakarta-log4j.spec:1.25 SPECS/jakarta-log4j.spec:1.26
--- SPECS/jakarta-log4j.spec:1.25	Sun May 21 16:00:19 2006
+++ SPECS/jakarta-log4j.spec	Sun May 21 22:24:29 2006
@@ -23,9 +23,9 @@
 BuildRequires:	javamail >= 1.2
 BuildRequires:	jdk >= 1.2
 #BuildRequires:	jms
-BuildRequires:	jpackage-utils
-BuildRequires:	junit >= 3.8
 BuildRequires:	jmx
+BuildRequires:	junit >= 3.8
+BuildRequires:	rpm-javaprov
 Requires:	javamail >= 1.2
 Requires:	jdk >= 1.2
 #Requires:	jms
@@ -88,6 +88,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2006/05/21 20:24:29  glen
+- use rpm-javaprov
+
 Revision 1.25  2006/05/21 14:00:19  glen
 - unneccessary unset
 

================================================================
Index: SPECS/java-gnu-mail.spec
diff -u SPECS/java-gnu-mail.spec:1.4 SPECS/java-gnu-mail.spec:1.5
--- SPECS/java-gnu-mail.spec:1.4	Sun May 21 15:51:43 2006
+++ SPECS/java-gnu-mail.spec	Sun May 21 22:24:29 2006
@@ -13,7 +13,7 @@
 BuildRequires:	automake
 BuildRequires:	java-gnu-activation
 BuildRequires:	java-gnu-inetlib
-BuildRequires:	jpackage-utils
+BuildRequires:	rpm-javaprov
 Requires:	jre
 Provides:	javamail = 1.3
 BuildArch:	noarch
@@ -83,6 +83,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2006/05/21 20:24:29  glen
+- use rpm-javaprov
+
 Revision 1.4  2006/05/21 13:51:43  radek
 - include macros.java, BR: jpackage-utils, use %java{,c} macros
 - ln -s gnumail.jar javamail.jar (or should it be just mail.jar?)

================================================================
Index: SPECS/java-sun.spec
diff -u SPECS/java-sun.spec:1.136 SPECS/java-sun.spec:1.137
--- SPECS/java-sun.spec:1.136	Sun May 21 17:45:57 2006
+++ SPECS/java-sun.spec	Sun May 21 22:24:29 2006
@@ -23,14 +23,14 @@
 Patch1:		%{name}-desktop.patch
 URL:		http://java.sun.com/linux/
 BuildRequires:	rpm-build >= 4.3-0.20040107.21
+BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.236
 BuildRequires:	unzip
-BuildRequires:	jpackage-utils
 Requires:	%{name}-jre = %{version}-%{release}
 Requires:	java-shared
 Requires:	jpackage-utils
-Provides:	jdk = %{version}
 Provides:	j2sdk = %{version}
+Provides:	jdk = %{version}
 Obsoletes:	blackdown-java-sdk
 Obsoletes:	ibm-java
 Obsoletes:	java-blackdown
@@ -102,23 +102,23 @@
 Summary(pl):	Sun JRE - środowisko uruchomieniowe Javy dla Linuksa
 Group:		Development/Languages/Java
 Requires:	java-jre-tools
-Provides:	java1.4
-Provides:	jre = %{version}
 Provides:	j2re = %{version}
-Provides:	java
 Provides:	jaas = %{version}
+Provides:	java
+Provides:	java1.4
 Provides:	jaxp = 1.3
+Provides:	jaxp_parser_impl
 Provides:	jce = %{version}
+Provides:	jdbc-stdext = %{version}
+Provides:	jdbc-stdext = 3.0
 Provides:	jmx = %{version}
 Provides:	jndi = %{version}
 Provides:	jndi-cos = %{version}
 Provides:	jndi-dns = %{version}
 Provides:	jndi-ldap = %{version}
 Provides:	jndi-rmi = %{version}
+Provides:	jre = %{version}
 Provides:	jsse = %{version}
-Provides:	jdbc-stdext = 3.0
-Provides:	jdbc-stdext = %{version}
-Provides:	jaxp_parser_impl
 Obsoletes:	jaas
 Obsoletes:	java-blackdown-jre
 Obsoletes:	jaxp
@@ -177,8 +177,8 @@
 Group:		Development/Languages/Java
 Requires:	%{name}-jre = %{version}-%{release}
 Provides:	jar
-Provides:	java-shared
 Provides:	java-jre-tools
+Provides:	java-shared
 Obsoletes:	fastjar
 Obsoletes:	jar
 Obsoletes:	java-jre-tools
@@ -212,23 +212,23 @@
 Group:		Development/Languages/Java
 Requires:	%{name}-jre-X11 = %{version}-%{release}
 Provides:	java-sun-mozilla-plugin
-Provides:	mozilla-plugin-java-sun
 Provides:	mozilla-firefox-plugin-java-sun
-Obsoletes:	java-blackdown-mozilla-plugin
+Provides:	mozilla-plugin-java-sun
 Obsoletes:	blackdown-java-sdk-mozilla-plugin
+Obsoletes:	java-blackdown-mozilla-plugin
 Obsoletes:	java-sun-moz-plugin
 Obsoletes:	java-sun-mozilla-plugin
 Obsoletes:	jre-mozilla-plugin
+Obsoletes:	mozilla-firefox-plugin-gcc2-java-sun
+Obsoletes:	mozilla-firefox-plugin-gcc3-java-sun
+Obsoletes:	mozilla-firefox-plugin-java-blackdown
+Obsoletes:	mozilla-firefox-plugin-java-sun
 Obsoletes:	mozilla-plugin-blackdown-java-sdk
 Obsoletes:	mozilla-plugin-gcc2-java-sun
 Obsoletes:	mozilla-plugin-gcc3-java-sun
 Obsoletes:	mozilla-plugin-gcc32-java-sun
 Obsoletes:	mozilla-plugin-java-blackdown
 Obsoletes:	mozilla-plugin-java-sun
-Obsoletes:	mozilla-firefox-plugin-gcc2-java-sun
-Obsoletes:	mozilla-firefox-plugin-gcc3-java-sun
-Obsoletes:	mozilla-firefox-plugin-java-blackdown
-Obsoletes:	mozilla-firefox-plugin-java-sun
 
 %description -n browser-plugin-%{name}
 Java plugin for WWW browsers.
@@ -841,6 +841,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.137  2006/05/21 20:24:29  glen
+- use rpm-javaprov
+
 Revision 1.136  2006/05/21 15:45:57  qboosh
 - X11 deps are autodetected
 

================================================================
Index: SPECS/jython.spec
diff -u SPECS/jython.spec:1.17 SPECS/jython.spec:1.18
--- SPECS/jython.spec:1.17	Sun May 21 20:01:35 2006
+++ SPECS/jython.spec	Sun May 21 22:24:29 2006
@@ -11,7 +11,7 @@
 # Source0-md5:	e3e6be56646fb7cd6d19a6a69bd76e2f
 URL:		http://www.jython.org/
 BuildRequires:	jdk
-BuildRequires:	jpackage-utils
+BuildRequires:	rpm-javaprov
 Requires:	jpackage-utils
 Requires:	jre
 BuildArch:	noarch
@@ -181,6 +181,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2006/05/21 20:24:29  glen
+- use rpm-javaprov
+
 Revision 1.17  2006/05/21 18:01:35  glen
 - missing defattr
 - use non-expanding heredoc

================================================================
Index: SPECS/qdox.spec
diff -u SPECS/qdox.spec:1.3 SPECS/qdox.spec:1.4
--- SPECS/qdox.spec:1.3	Fri May 19 13:28:20 2006
+++ SPECS/qdox.spec	Sun May 21 22:24:29 2006
@@ -19,14 +19,14 @@
 Source5:	%{name}-LocatedDef.java
 Patch0:		%{name}-1.5-parser_y.patch
 URL:		http://qdox.codehaus.org/
-BuildRequires:	byaccj
 BuildRequires:	ant >= 1.6
+BuildRequires:	byaccj
 BuildRequires:	jflex
 BuildRequires:	jmock >= 1.0
-#BuildRequires:	jpackage-utils >= 1.6
 BuildRequires:	junit >= 3.8.1
 BuildRequires:	maven
 BuildRequires:	mockobjects >= 0.09
+#BuildRequires:	rpm-javaprov
 BuildRequires:	saxon
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -140,6 +140,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2006/05/21 20:24:29  glen
+- use rpm-javaprov
+
 Revision 1.3  2006/05/19 11:28:20  jajcus
 - s/jakarta-ant/ant/ in BR
 

================================================================
Index: SPECS/statcvs.spec
diff -u SPECS/statcvs.spec:1.3 SPECS/statcvs.spec:1.4
--- SPECS/statcvs.spec:1.3	Sun Jun  5 03:47:21 2005
+++ SPECS/statcvs.spec	Sun May 21 22:24:29 2006
@@ -9,17 +9,17 @@
 Release:	0.2
 Epoch:		0
 License:	LGPL
-Group:		Development/Libraries/Java
+Group:		Development/Languages/Java
 Source0:	http://dl.sourceforge.net/statcvs/%{name}-%{version}.zip
 # Source0-md5:	99a0f04064d25c595b91972735a33c69
 URL:		http://statcvs.sourceforge.net/
 #BuildRequires:	ant >= 0:1.6
-#BuildRequires:	ant-junit >= 0:1.6 
+#BuildRequires:	ant-junit >= 0:1.6
 #BuildRequires:	java-devel >= 1.4
 #BuildRequires:	jcommon >= 0:0.9.7
 #BuildRequires:	jfreechart >= 0:0.9.20
-#BuildRequires:	jpackage-utils >= 0:1.5.32
 #BuildRequires:	junit >= 0:3.8.1
+#BuildRequires:	rpm-javaprov
 BuildRequires:	unzip
 Requires:	cvs
 #Requires:	java-devel >= 1.4
@@ -69,6 +69,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2006/05/21 20:24:29  glen
+- use rpm-javaprov
+
 Revision 1.3  2005/06/05 01:47:21  zbyniu
 - BR: unzip
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ant.spec?r1=1.53&r2=1.54&f=u
    http://cvs.pld-linux.org/SPECS/aspectwerkz.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/castor.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/eclipse.spec?r1=1.64&r2=1.65&f=u
    http://cvs.pld-linux.org/SPECS/jakarta-log4j.spec?r1=1.25&r2=1.26&f=u
    http://cvs.pld-linux.org/SPECS/java-gnu-mail.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/java-sun.spec?r1=1.136&r2=1.137&f=u
    http://cvs.pld-linux.org/SPECS/jython.spec?r1=1.17&r2=1.18&f=u
    http://cvs.pld-linux.org/SPECS/qdox.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/statcvs.spec?r1=1.3&r2=1.4&f=u

More information about the pld-cvs-commit mailing list