packages: java-xmlgraphics-commons/java-xmlgraphics-commons.spec, java-xmlg...

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

Author: jajcus                       Date: Sat Apr 17 07:44:37 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/java-xmlgraphics-commons:
   java-xmlgraphics-commons.spec (1.13 -> 1.14) 
packages/java-xmlgraphics-fop:
   java-xmlgraphics-fop.spec (1.53 -> 1.54) 
packages/java-xmlunit:
   java-xmlunit.spec (1.14 -> 1.15) 
packages/java-xstream:
   java-xstream.spec (1.4 -> 1.5) 
packages/jtrac:
   jtrac.spec (1.8 -> 1.9) 
packages/lenya:
   lenya.spec (1.13 -> 1.14) 
packages/libgda4:
   libgda4.spec (1.10 -> 1.11) 
packages/openfire:
   openfire.spec (1.20 -> 1.21) 
packages/openoffice.org:
   openoffice.org.spec (1.860 -> 1.861) 
packages/sphinx:
   sphinx.spec (1.27 -> 1.28) 
packages/stanse:
   stanse.spec (1.5 -> 1.6) 
packages/subversion:
   subversion.spec (1.275 -> 1.276) 
packages/tomcat-native:
   tomcat-native.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: packages/java-xmlgraphics-commons/java-xmlgraphics-commons.spec
diff -u packages/java-xmlgraphics-commons/java-xmlgraphics-commons.spec:1.13 packages/java-xmlgraphics-commons/java-xmlgraphics-commons.spec:1.14
--- packages/java-xmlgraphics-commons/java-xmlgraphics-commons.spec:1.13	Tue Apr  6 23:05:14 2010
+++ packages/java-xmlgraphics-commons/java-xmlgraphics-commons.spec	Sat Apr 17 09:44:31 2010
@@ -18,14 +18,14 @@
 BuildRequires:	java-commons-io
 BuildRequires:	java-commons-logging
 BuildRequires:	java-junit >= 3.8.1
-BuildRequires:	java-sun
+BuildRequires:	jdk
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 # disable internal-codecs in build.properities for compatibility with other jre's
 Requires:	java-commons-io
 Requires:	java-commons-logging
-Requires:	java-sun-jre >= 1.4
+Requires:	jre >= 1.4
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -80,6 +80,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2010/04/17 07:44:31  jajcus
+- do not pull java-sun via BR - icedtea6 should be enough in all (most) cases
+
 Revision 1.13  2010/04/06 21:05:14  sparky
 - BR: rpm-javaprov
 

================================================================
Index: packages/java-xmlgraphics-fop/java-xmlgraphics-fop.spec
diff -u packages/java-xmlgraphics-fop/java-xmlgraphics-fop.spec:1.53 packages/java-xmlgraphics-fop/java-xmlgraphics-fop.spec:1.54
--- packages/java-xmlgraphics-fop/java-xmlgraphics-fop.spec:1.53	Sun Apr  4 22:09:52 2010
+++ packages/java-xmlgraphics-fop/java-xmlgraphics-fop.spec	Sat Apr 17 09:44:32 2010
@@ -27,7 +27,7 @@
 URL:		http://xmlgrapics.apache.org/fop/
 BuildRequires:	glibc-localedb-all
 %{?with_tests:BuildRequires:	java-junit}
-BuildRequires:	java-sun
+BuildRequires:	jdk
 BuildRequires:	java-xalan
 BuildRequires:	java-xerces
 BuildRequires:	java-xmlgraphics-batik
@@ -138,6 +138,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.54  2010/04/17 07:44:32  jajcus
+- do not pull java-sun via BR - icedtea6 should be enough in all (most) cases
+
 Revision 1.53  2010/04/04 20:09:52  pawelz
 - TODO:
 - - I'm not able to produce correct UTF-8 character in PDF/PNG output (-awt

================================================================
Index: packages/java-xmlunit/java-xmlunit.spec
diff -u packages/java-xmlunit/java-xmlunit.spec:1.14 packages/java-xmlunit/java-xmlunit.spec:1.15
--- packages/java-xmlunit/java-xmlunit.spec:1.14	Thu Apr  1 20:09:22 2010
+++ packages/java-xmlunit/java-xmlunit.spec	Sat Apr 17 09:44:32 2010
@@ -5,7 +5,7 @@
 #   dblatex command. I have no idea what it is and what should provide it.
 
 # NOTES:
-# - I'm forcing java_sun because it does not pass test_Transform on gcj.
+# - I'm conflicting java-gcj-compat because it does not pass test_Transform on gcj.
 
 %bcond_with	doc		# build docs. Does not work.
 
@@ -23,13 +23,14 @@
 BuildRequires:	ant >= 1.5
 BuildRequires:	ant-junit
 BuildRequires:	ant-trax
-BuildRequires:	java-sun
 BuildRequires:	jaxp_parser_impl
 BuildRequires:	jaxp_transform_impl
+BuildRequires:	jdk
 BuildRequires:	jpackage-utils
 BuildRequires:	java-junit
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.300
+BuildConflicts: java-gcj-compat
 Requires:	jaxp_parser_impl
 Requires:	jaxp_transform_impl
 Requires:	java-junit
@@ -113,6 +114,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2010/04/17 07:44:32  jajcus
+- do not pull java-sun via BR - icedtea6 should be enough in all (most) cases
+
 Revision 1.14  2010/04/01 18:09:22  pawelz
 - fixed Summary (this package does not contain NUnit part)
 

================================================================
Index: packages/java-xstream/java-xstream.spec
diff -u packages/java-xstream/java-xstream.spec:1.4 packages/java-xstream/java-xstream.spec:1.5
--- packages/java-xstream/java-xstream.spec:1.4	Mon Mar 30 15:12:37 2009
+++ packages/java-xstream/java-xstream.spec	Sat Apr 17 09:44:33 2010
@@ -1,7 +1,6 @@
 # $Revision$, $Date$
 # TODO:
 # - get rid of bundled jars. Use system libraries.
-# - build on gcj (is it possible? It requires requires sun.reflect.ReflectionFactory)
 #
 # Conditional build:
 %bcond_without	javadoc		# don't build javadoc
@@ -21,7 +20,7 @@
 BuildRequires:	ant
 BuildRequires:	ant-junit
 BuildRequires:	ant-trax
-BuildRequires:	java-sun
+BuildRequires:	jdk
 BuildRequires:	jpackage-utils
 BuildRequires:	junit
 BuildRequires:	rpm-javaprov
@@ -93,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:33  jajcus
+- do not pull java-sun via BR - icedtea6 should be enough in all (most) cases
+
 Revision 1.4  2009/03/30 13:12:37  pawelz
 - TODO
 

================================================================
Index: packages/jtrac/jtrac.spec
diff -u packages/jtrac/jtrac.spec:1.8 packages/jtrac/jtrac.spec:1.9
--- packages/jtrac/jtrac.spec:1.8	Thu Nov 19 14:58:49 2009
+++ packages/jtrac/jtrac.spec	Sat Apr 17 09:44:33 2010
@@ -18,7 +18,7 @@
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	unzip
-Requires:	java-sun-jre >= 1.6.0.17
+Requires:	jre >= 1.6.0.17
 Requires:	jpackage-utils
 Requires:	tomcat
 BuildArch:	noarch
@@ -64,6 +64,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2010/04/17 07:44:33  jajcus
+- do not pull java-sun via BR - icedtea6 should be enough in all (most) cases
+
 Revision 1.8  2009/11/19 13:58:49  pawelz
 - configuration may contain passwords (for example db passwords), so it
   shouldn't be readable by anyone

================================================================
Index: packages/lenya/lenya.spec
diff -u packages/lenya/lenya.spec:1.13 packages/lenya/lenya.spec:1.14
--- packages/lenya/lenya.spec:1.13	Mon Oct 12 23:03:23 2009
+++ packages/lenya/lenya.spec	Sat Apr 17 09:44:33 2010
@@ -23,10 +23,11 @@
 Patch0:		%{name}-langpl.patch
 URL:		http://lenya.apache.org/
 BuildRequires:	ant
-BuildRequires:	java-sun
+BuildRequires:	jdk
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
+BuildConflicts:	java-gcj-compat
 Requires:	group(servlet)
 Requires:	jpackage-utils
 BuildArch:	noarch
@@ -102,6 +103,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2010/04/17 07:44:33  jajcus
+- do not pull java-sun via BR - icedtea6 should be enough in all (most) cases
+
 Revision 1.13  2009/10/12 21:03:23  pawelz
 - allow to create docs in polish language.
 

================================================================
Index: packages/libgda4/libgda4.spec
diff -u packages/libgda4/libgda4.spec:1.10 packages/libgda4/libgda4.spec:1.11
--- packages/libgda4/libgda4.spec:1.10	Wed Dec 23 21:26:29 2009
+++ packages/libgda4/libgda4.spec	Sat Apr 17 09:44:34 2010
@@ -35,7 +35,7 @@
 BuildRequires:	glib2-devel >= 1:2.18.0
 BuildRequires:	gtk-doc >= 1.6
 BuildRequires:	intltool >= 0.40.0
-%{?with_jdbc:BuildRequires:	java-sun}
+%{?with_jdbc:BuildRequires:	jdk}
 BuildRequires:	json-glib-devel
 BuildRequires:	libsoup-devel >= 2.24.0
 BuildRequires:	libtool
@@ -337,6 +337,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2010/04/17 07:44:34  jajcus
+- do not pull java-sun via BR - icedtea6 should be enough in all (most) cases
+
 Revision 1.10  2009/12/23 20:26:29  megabajt
 - run gtkdocize
 

================================================================
Index: packages/openfire/openfire.spec
diff -u packages/openfire/openfire.spec:1.20 packages/openfire/openfire.spec:1.21
--- packages/openfire/openfire.spec:1.20	Fri Jan  1 23:33:06 2010
+++ packages/openfire/openfire.spec	Sat Apr 17 09:44:34 2010
@@ -20,15 +20,16 @@
 BuildRequires:	java-commons-el
 BuildRequires:	java-commons-httpclient
 BuildRequires:	java-servletapi5
-BuildRequires:	java-sun
+BuildRequires:	jdk
 BuildRequires:	java-mail
 BuildRequires:	java-commons-lang
 BuildRequires:	java-commons-logging
 BuildRequires:	java-jdom
 BuildRequires:	java-qdox
 BuildRequires:	tomcat-jasper
-Requires:	java-sun
-Requires:	java-sun-jre-X11
+BuildConflicts:	java-gcj-compat
+Requires:	jre
+Requires:	jre-X11
 #BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -157,6 +158,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2010/04/17 07:44:34  jajcus
+- do not pull java-sun via BR - icedtea6 should be enough in all (most) cases
+
 Revision 1.20  2010/01/01 22:33:06  sparky
 - BR capitalization
 

================================================================
Index: packages/openoffice.org/openoffice.org.spec
diff -u packages/openoffice.org/openoffice.org.spec:1.860 packages/openoffice.org/openoffice.org.spec:1.861
--- packages/openoffice.org/openoffice.org.spec:1.860	Sun Apr 11 17:28:34 2010
+++ packages/openoffice.org/openoffice.org.spec	Sat Apr 17 09:44:34 2010
@@ -251,14 +251,14 @@
 BuildRequires:	ant
 BuildRequires:	ant-apache-regexp
 %{?with_system_db:BuildRequires:	db-java >= 4.3}
-BuildRequires:	java-sun >= 1.4.0_00
-BuildRequires:	java-sun-jre-X11
-BuildRequires:	java-sun-tools
+BuildRequires:	jdk >= 1.4.0_00
+BuildRequires:	jre-X11
 %endif
 BuildRequires:	xulrunner-devel
 BuildConflicts:	xmlsec1-devel
 # contains (dlopened) *.so libs
 BuildConflicts:	xmlsec1-nss
+BuildConflicts:	java-gcj-compat
 Requires:	%{name}-base = %{epoch}:%{version}-%{release}
 Requires:	%{name}-calc = %{epoch}:%{version}-%{release}
 Requires:	%{name}-draw = %{epoch}:%{version}-%{release}
@@ -4624,6 +4624,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.861  2010/04/17 07:44:34  jajcus
+- do not pull java-sun via BR - icedtea6 should be enough in all (most) cases
+
 Revision 1.860  2010/04/11 15:28:34  arekm
 - release 2
 

================================================================
Index: packages/sphinx/sphinx.spec
diff -u packages/sphinx/sphinx.spec:1.27 packages/sphinx/sphinx.spec:1.28
--- packages/sphinx/sphinx.spec:1.27	Mon Apr 12 13:49:09 2010
+++ packages/sphinx/sphinx.spec	Sat Apr 17 09:44:35 2010
@@ -8,10 +8,7 @@
 %bcond_without	mysql		# without MySQL support
 %bcond_without	pgsql		# without PostgreSQL support
 
-# arch list synced with java-sun
-%ifnarch i586 i686 pentium3 pentium4 athlon %{x8664}
 %undefine	with_java
-%endif
 
 %{?with_java:%include	/usr/lib/rpm/macros.java}
 %include	/usr/lib/rpm/macros.php
@@ -33,7 +30,7 @@
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	expat-devel
-%{?with_java:BuildRequires:	java-sun}
+%{?with_java:BuildRequires:	jdk}
 BuildRequires:	libstdc++-devel
 %{?with_libstemmer:BuildRequires:	libstemmer-devel}
 %{?with_mysql:BuildRequires:	mysql-devel}
@@ -302,6 +299,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2010/04/17 07:44:35  jajcus
+- do not pull java-sun via BR - icedtea6 should be enough in all (most) cases
+
 Revision 1.27  2010/04/12 11:49:09  glen
 - add log archive dir
 

================================================================
Index: packages/stanse/stanse.spec
diff -u packages/stanse/stanse.spec:1.5 packages/stanse/stanse.spec:1.6
--- packages/stanse/stanse.spec:1.5	Sun Oct 18 00:19:20 2009
+++ packages/stanse/stanse.spec	Sat Apr 17 09:44:36 2010
@@ -19,11 +19,12 @@
 BuildRequires:	ant
 BuildRequires:	ant-antlr3
 BuildRequires:	ant-cpptasks
-BuildRequires:	java-sun
+BuildRequires:	jdk
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
+BuildConflicts:	java-gcj-compat
 Requires:	gcc
 Requires:	make
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -158,6 +159,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2010/04/17 07:44:36  jajcus
+- do not pull java-sun via BR - icedtea6 should be enough in all (most) cases
+
 Revision 1.5  2009/10/17 22:19:20  pawelz
 - it's arch dependent because of stcparser-c
 - does not build with gcj. BR java-sun

================================================================
Index: packages/subversion/subversion.spec
diff -u packages/subversion/subversion.spec:1.275 packages/subversion/subversion.spec:1.276
--- packages/subversion/subversion.spec:1.275	Wed Mar 31 17:09:06 2010
+++ packages/subversion/subversion.spec	Sat Apr 17 09:44:36 2010
@@ -1,6 +1,5 @@
 # $Revision$, $Date$
 # TODO:
-# - fix java build with java-gcj-compat and s/java-sun/jdk/
 # - remove net_client_only and add db bcond (then without apache and
 #   without db => net_client_only - spec will be more simpler, I think)
 # - finish ruby
@@ -18,10 +17,6 @@
 %bcond_without	kwallet			# build without kde4 wallet support
 %bcond_without	gnome			# build without gnome keyring support
 #
-%ifnarch i586 i686 pentium3 pentium4 athlon %{x8664}
-%undefine	with_javahl
-%endif
-#
 %{!?with_net_client_only:%include	/usr/lib/rpm/macros.perl}
 %define	apxs	/usr/sbin/apxs
 %define	pdir	SVN
@@ -77,8 +72,7 @@
 BuildRequires:	swig-ruby >= 1.3.24
 %endif
 %if %{with javahl}
-BuildRequires:	java-sun
-BuildRequires:	java-sun-tools
+BuildRequires:	jdk
 %endif
 BuildRequires:	cyrus-sasl-devel
 %endif
@@ -833,6 +827,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.276  2010/04/17 07:44:36  jajcus
+- do not pull java-sun via BR - icedtea6 should be enough in all (most) cases
+
 Revision 1.275  2010/03/31 15:09:06  baggins
 - rel 5
 - preun for apache modules was totally wrong, use postun!

================================================================
Index: packages/tomcat-native/tomcat-native.spec
diff -u packages/tomcat-native/tomcat-native.spec:1.11 packages/tomcat-native/tomcat-native.spec:1.12
--- packages/tomcat-native/tomcat-native.spec:1.11	Wed Apr 14 15:00:26 2010
+++ packages/tomcat-native/tomcat-native.spec	Sat Apr 17 09:44:36 2010
@@ -18,13 +18,14 @@
 BuildRequires:	apr-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	java-sun
+BuildRequires:	jdk
 BuildRequires:	jpackage-utils
 BuildRequires:	libtool
 BuildRequires:	openssl-devel
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
+BuildConflicts:	java-gcj-compat
 ExclusiveArch:	i586 i686 pentium3 pentium4 athlon %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -149,6 +150,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2010/04/17 07:44:36  jajcus
+- do not pull java-sun via BR - icedtea6 should be enough in all (most) cases
+
 Revision 1.11  2010/04/14 13:00:26  pawelz
 - rel 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-xmlgraphics-commons/java-xmlgraphics-commons.spec?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-xmlgraphics-fop/java-xmlgraphics-fop.spec?r1=1.53&r2=1.54&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-xmlunit/java-xmlunit.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-xstream/java-xstream.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jtrac/jtrac.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lenya/lenya.spec?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libgda4/libgda4.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openfire/openfire.spec?r1=1.20&r2=1.21&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openoffice.org/openoffice.org.spec?r1=1.860&r2=1.861&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/sphinx/sphinx.spec?r1=1.27&r2=1.28&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/stanse/stanse.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/subversion/subversion.spec?r1=1.275&r2=1.276&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat-native/tomcat-native.spec?r1=1.11&r2=1.12&f=u

More information about the pld-cvs-commit mailing list