Author: glen Date: Tue May 23 20:34:43 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- rpmbuild(macros) >= 1.300 instead of macros.java rpm-javaprov
---- Files affected:
SPECS:
ant.spec (1.54 -> 1.55) , aspectwerkz.spec (1.4 -> 1.5) , castor.spec (1.4
-> 1.5) , eclipse.spec (1.65 -> 1.66) , fop.spec (1.32 -> 1.33) , jacl.spec
(1.8 -> 1.9) , jakarta-log4j.spec (1.26 -> 1.27) , java-gnu-mail.spec (1.6 ->
1.7) , java-sun.spec (1.137 -> 1.138) , jython.spec (1.19 -> 1.20) , qdox.spec
(1.4 -> 1.5) , statcvs.spec (1.4 -> 1.5) , xalan-j.spec (1.22 -> 1.23) ,
xerces-j.spec (1.27 -> 1.28)
---- Diffs:
================================================================
Index: SPECS/ant.spec
diff -u SPECS/ant.spec:1.54 SPECS/ant.spec:1.55
--- SPECS/ant.spec:1.54 Sun May 21 22:24:29 2006
+++ SPECS/ant.spec Tue May 23 22:34:37 2006
@@ -1,8 +1,6 @@
# $Revision$, $Date$
-%include /usr/lib/rpm/macros.java
-#
-# TODO:
-# - prepare all BR and test the full build
+# TODO
+# - prepare all BR and test the full build
# Conditional build:
%bcond_with bootstrap # minimal build for bootstrap
%bcond_without antlr # disable building antlr optional task(s)
@@ -65,8 +63,8 @@
%{?with_jsch:BuildRequires: jsch}
%{?with_junit:BuildRequires: junit}
%{?with_bsf:BuildRequires: jython}
-BuildRequires: rpm-javaprov
BuildRequires: rpm-pythonprov
+BuildRequires: rpmbuild(macros) >= 1.300
Requires: jdk
Requires: jpackage-utils
Obsoletes: jakarta-ant
@@ -759,6 +757,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.55 2006/05/23 20:34:37 glen
+- rpmbuild(macros) >= 1.300 instead of macros.java rpm-javaprov
+
Revision 1.54 2006/05/21 20:24:29 glen
- use rpm-javaprov
================================================================
Index: SPECS/aspectwerkz.spec
diff -u SPECS/aspectwerkz.spec:1.4 SPECS/aspectwerkz.spec:1.5
--- SPECS/aspectwerkz.spec:1.4 Sun May 21 22:24:29 2006
+++ SPECS/aspectwerkz.spec Tue May 23 22:34:37 2006
@@ -25,7 +25,6 @@
BuildRequires: junitperf
BuildRequires: piccolo
BuildRequires: qdox
-#BuildRequires: rpm-javaprov
Requires: concurrent
Requires: dom4j
Requires: gnu.trove
@@ -214,6 +213,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.5 2006/05/23 20:34:37 glen
+- rpmbuild(macros) >= 1.300 instead of macros.java rpm-javaprov
+
Revision 1.4 2006/05/21 20:24:29 glen
- use rpm-javaprov
================================================================
Index: SPECS/castor.spec
diff -u SPECS/castor.spec:1.4 SPECS/castor.spec:1.5
--- SPECS/castor.spec:1.4 Sun May 21 22:24:29 2006
+++ SPECS/castor.spec Tue May 23 22:34:37 2006
@@ -20,7 +20,6 @@
BuildRequires: jta
BuildRequires: junit
BuildRequires: ldapsdk
-#BuildRequires: rpm-javaprov
BuildRequires: xerces-j
Requires: adaptx
Requires: cglib
@@ -177,6 +176,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.5 2006/05/23 20:34:37 glen
+- rpmbuild(macros) >= 1.300 instead of macros.java rpm-javaprov
+
Revision 1.4 2006/05/21 20:24:29 glen
- use rpm-javaprov
================================================================
Index: SPECS/eclipse.spec
diff -u SPECS/eclipse.spec:1.65 SPECS/eclipse.spec:1.66
--- SPECS/eclipse.spec:1.65 Sun May 21 22:24:29 2006
+++ SPECS/eclipse.spec Tue May 23 22:34:37 2006
@@ -1,6 +1,4 @@
# $Revision$, $Date$
-%include /usr/lib/rpm/macros.java
-#
# TODO:
# - separate SWT (there are separate tarballs at
http://www.eclipse.org/swt/)
# and add proper provides, obsoletes, conflicts etc.
where needed.
@@ -29,8 +27,7 @@
BuildRequires: ant >= 1.6.1
BuildRequires: jdk >= 1.4
BuildRequires: pkgconfig
-BuildRequires: rpm-javaprov
-BuildRequires: rpmbuild(macros) >= 1.213
+BuildRequires: rpmbuild(macros) >= 1.300
BuildRequires: unzip
BuildRequires: zip
Requires: ant
@@ -257,6 +254,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.66 2006/05/23 20:34:37 glen
+- rpmbuild(macros) >= 1.300 instead of macros.java rpm-javaprov
+
Revision 1.65 2006/05/21 20:24:29 glen
- use rpm-javaprov
@@ -264,7 +264,7 @@
- use jpackage-utils for build. No hardcoded JAVA_HOME.
Revision 1.63 2006/05/20 14:26:15 arekm
-R: ant in R, too
+- R: ant in R, too
Revision 1.62 2006/05/19 20:48:55 arekm
- unpackaged files are now packaged
================================================================
Index: SPECS/fop.spec
diff -u SPECS/fop.spec:1.32 SPECS/fop.spec:1.33
--- SPECS/fop.spec:1.32 Tue May 23 21:20:49 2006
+++ SPECS/fop.spec Tue May 23 22:34:37 2006
@@ -1,20 +1,19 @@
# $Revision$, $Date$
-%include /usr/lib/rpm/macros.java
Summary: XSL Formatter in Java
Summary(pl): Formater XSL napisany w Javie
Name: fop
Version: 0.20.5
Release: 1
-Vendor: http://xml.apache.org/
License: Apache v1.1
Group: Applications/Publishing/XML/Java
Source0:
http://www.apache.org/dist/xml/fop/source/%{name}-%{version}-src.tar.gz
# Source0-md5: 1a31eb1357e5d4b8d32d4cb3edae2da2
-Source1: fop-font-install.sh
-Source2: fop.sh
+Source1: %{name}-font-install.sh
+Source2: %{name}.sh
URL: http://xml.apache.org/fop/
BuildRequires: batik
BuildRequires: jdk >= 1.3
+BuildRequires: rpmbuild(macros) >= 1.300
BuildRequires: xalan-j
BuildRequires: xerces-j
Requires: batik
@@ -89,6 +88,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.33 2006/05/23 20:34:37 glen
+- rpmbuild(macros) >= 1.300 instead of macros.java rpm-javaprov
+
Revision 1.32 2006/05/23 19:20:49 radek
- tweaked CLASSPATH, still doesn't build (how to pass -source?)
================================================================
Index: SPECS/jacl.spec
diff -u SPECS/jacl.spec:1.8 SPECS/jacl.spec:1.9
--- SPECS/jacl.spec:1.8 Tue May 23 07:53:02 2006
+++ SPECS/jacl.spec Tue May 23 22:34:37 2006
@@ -1,10 +1,10 @@
# $Revision$, $Date$
-# TODO: resolve tcljava.jar conflict with tclBlend
+# TODO
+# - resolve tcljava.jar conflict with tclBlend
#
# Conditional build:
%bcond_with javac # use javac instead of jikes
#
-%include /usr/lib/rpm/macros.java
Summary: Java Application Command Language
Summary(pl): Java Application Command Language - język poleceń dla aplikacji
Name: jacl
@@ -15,12 +15,13 @@
Source0: http://dl.sourceforge.net/tcljava/%{name}%{version}.tar.gz
# Source0-md5: 44ec6149e1664d4fc13651e9288dd2b6
URL: http://tcljava.sourceforge.net/
+BuildRequires: rpmbuild(macros) >= 1.300
BuildRequires: sed >= 4.0
%if %{with javac}
BuildRequires: jdk
ExclusiveArch: i586 i686 pentium3 pentium4 athlon %{x8664} noarch
%else
-BuildRequires: jikes
+BuildRequires: jikes
%endif
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -95,6 +96,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.9 2006/05/23 20:34:37 glen
+- rpmbuild(macros) >= 1.300 instead of macros.java rpm-javaprov
+
Revision 1.8 2006/05/23 05:53:02 qboosh
- tabs
================================================================
Index: SPECS/jakarta-log4j.spec
diff -u SPECS/jakarta-log4j.spec:1.26 SPECS/jakarta-log4j.spec:1.27
--- SPECS/jakarta-log4j.spec:1.26 Sun May 21 22:24:29 2006
+++ SPECS/jakarta-log4j.spec Tue May 23 22:34:37 2006
@@ -1,5 +1,4 @@
# $Revision$, $Date$
-#
# TODO:
# - do something with jms / jmx requirements;
#
http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2006-May/017648.html
@@ -8,7 +7,6 @@
# - javamail is provided by java-gnu-mail
# - jmx by java-sun-jre
#
-%include /usr/lib/rpm/macros.java
Summary: log4j - logging for Java
Summary(pl): log4j - zapis logów dla Javy
Name: jakarta-log4j
@@ -25,7 +23,7 @@
#BuildRequires: jms
BuildRequires: jmx
BuildRequires: junit >= 3.8
-BuildRequires: rpm-javaprov
+BuildRequires: rpmbuild(macros) >= 1.300
Requires: javamail >= 1.2
Requires: jdk >= 1.2
#Requires: jms
@@ -88,6 +86,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.27 2006/05/23 20:34:37 glen
+- rpmbuild(macros) >= 1.300 instead of macros.java rpm-javaprov
+
Revision 1.26 2006/05/21 20:24:29 glen
- use rpm-javaprov
================================================================
Index: SPECS/java-gnu-mail.spec
diff -u SPECS/java-gnu-mail.spec:1.6 SPECS/java-gnu-mail.spec:1.7
--- SPECS/java-gnu-mail.spec:1.6 Tue May 23 18:31:16 2006
+++ SPECS/java-gnu-mail.spec Tue May 23 22:34:37 2006
@@ -1,5 +1,4 @@
# $Revision$, $Date$
-%include /usr/lib/rpm/macros.java
Summary: GNU implementation of JavaMail API specification
Summary(pl): Implementacja GNU specyfikacji JavaMail
Name: java-gnu-mail
@@ -14,7 +13,7 @@
BuildRequires: automake
BuildRequires: java-gnu-activation
BuildRequires: java-gnu-inetlib
-BuildRequires: rpm-javaprov
+BuildRequires: rpmbuild(macros) >= 1.300
Requires: jre
Provides: javamail = 1.3
BuildArch: noarch
@@ -92,6 +91,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.7 2006/05/23 20:34:37 glen
+- rpmbuild(macros) >= 1.300 instead of macros.java rpm-javaprov
+
Revision 1.6 2006/05/23 16:31:16 qboosh
- pl
================================================================
Index: SPECS/java-sun.spec
diff -u SPECS/java-sun.spec:1.137 SPECS/java-sun.spec:1.138
--- SPECS/java-sun.spec:1.137 Sun May 21 22:24:29 2006
+++ SPECS/java-sun.spec Tue May 23 22:34:37 2006
@@ -1,6 +1,4 @@
# $Revision$, $Date$
-%include /usr/lib/rpm/macros.java
-#
# TODO:
# - better way to choose preferred jvm (currently the symlinks are
hardcoded)
# Maybe a package containing only the symlinks?
@@ -23,8 +21,7 @@
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: rpmbuild(macros) >= 1.300
BuildRequires: unzip
Requires: %{name}-jre = %{version}-%{release}
Requires: java-shared
@@ -841,6 +838,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.138 2006/05/23 20:34:37 glen
+- rpmbuild(macros) >= 1.300 instead of macros.java rpm-javaprov
+
Revision 1.137 2006/05/21 20:24:29 glen
- use rpm-javaprov
================================================================
Index: SPECS/jython.spec
diff -u SPECS/jython.spec:1.19 SPECS/jython.spec:1.20
--- SPECS/jython.spec:1.19 Tue May 23 19:41:43 2006
+++ SPECS/jython.spec Tue May 23 22:34:37 2006
@@ -1,5 +1,4 @@
# $Revision$, $Date$
-%include /usr/lib/rpm/macros.java
Summary: Python implementation in Java
Summary(pl): Implementacja języka Python w Javie
Name: jython
@@ -11,7 +10,7 @@
# Source0-md5: e3e6be56646fb7cd6d19a6a69bd76e2f
URL: http://www.jython.org/
BuildRequires: jdk
-BuildRequires: rpm-javaprov
+BuildRequires: rpmbuild(macros) >= 1.300
Requires: jpackage-utils
Requires: jre
BuildArch: noarch
@@ -185,6 +184,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.20 2006/05/23 20:34:37 glen
+- rpmbuild(macros) >= 1.300 instead of macros.java rpm-javaprov
+
Revision 1.19 2006/05/23 17:41:43 qboosh
- completed pl
================================================================
Index: SPECS/qdox.spec
diff -u SPECS/qdox.spec:1.4 SPECS/qdox.spec:1.5
--- SPECS/qdox.spec:1.4 Sun May 21 22:24:29 2006
+++ SPECS/qdox.spec Tue May 23 22:34:37 2006
@@ -26,7 +26,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 +139,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.5 2006/05/23 20:34:37 glen
+- rpmbuild(macros) >= 1.300 instead of macros.java rpm-javaprov
+
Revision 1.4 2006/05/21 20:24:29 glen
- use rpm-javaprov
================================================================
Index: SPECS/statcvs.spec
diff -u SPECS/statcvs.spec:1.4 SPECS/statcvs.spec:1.5
--- SPECS/statcvs.spec:1.4 Sun May 21 22:24:29 2006
+++ SPECS/statcvs.spec Tue May 23 22:34:37 2006
@@ -19,7 +19,6 @@
#BuildRequires: jcommon >= 0:0.9.7
#BuildRequires: jfreechart >= 0:0.9.20
#BuildRequires: junit >= 0:3.8.1
-#BuildRequires: rpm-javaprov
BuildRequires: unzip
Requires: cvs
#Requires: java-devel >= 1.4
@@ -69,6 +68,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.5 2006/05/23 20:34:37 glen
+- rpmbuild(macros) >= 1.300 instead of macros.java rpm-javaprov
+
Revision 1.4 2006/05/21 20:24:29 glen
- use rpm-javaprov
================================================================
Index: SPECS/xalan-j.spec
diff -u SPECS/xalan-j.spec:1.22 SPECS/xalan-j.spec:1.23
--- SPECS/xalan-j.spec:1.22 Tue May 23 20:16:45 2006
+++ SPECS/xalan-j.spec Tue May 23 22:34:37 2006
@@ -1,13 +1,12 @@
# $Revision$, $Date$
+# TODO
+# - without_docs bcond; generating takes ages
#
-# TODO: without_docs bcond; generating takes ages
-#
-%include /usr/lib/rpm/macros.java
+%define _ver %(echo %{version} | tr . _)
Summary: XSLT processor for Java
Summary(pl): Procesor XSLT napisany w Javie
Name: xalan-j
Version: 2.6.0
-%define _ver %(echo %{version} | tr . _)
Release: 2
License: Apache v2.0
Group: Applications/Publishing/XML/Java
@@ -16,17 +15,18 @@
Patch0: %{name}-dom3.patch
URL: http://xml.apache.org/xalan-j/
BuildRequires: ant >= 1.5
+BuildRequires: jakarta-bcel
+BuildRequires: jaxp_parser_impl
BuildRequires: jdk >= 1.2
+BuildRequires: rpmbuild(macros) >= 1.300
BuildRequires: xml-commons
-BuildRequires: jaxp_parser_impl
-BuildRequires: jakarta-bcel
# servlet provided by jakarta-servletapi.spec
# also resin.spec, resin-cmp.spec seem to provide it by simple grep.
-BuildRequires: servlet
-BuildRequires: jlex
BuildRequires: java_cup
-Requires: jre >= 1.2
+BuildRequires: jlex
+BuildRequires: servlet
Requires: jaxp_parser_impl
+Requires: jre >= 1.2
Provides: jaxp_transform_impl
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -96,6 +96,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.23 2006/05/23 20:34:37 glen
+- rpmbuild(macros) >= 1.300 instead of macros.java rpm-javaprov
+
Revision 1.22 2006/05/23 18:16:45 radek
- pl summary for -doc
================================================================
Index: SPECS/xerces-j.spec
diff -u SPECS/xerces-j.spec:1.27 SPECS/xerces-j.spec:1.28
--- SPECS/xerces-j.spec:1.27 Tue May 23 20:33:32 2006
+++ SPECS/xerces-j.spec Tue May 23 22:34:37 2006
@@ -1,5 +1,4 @@
# $Revision$, $Date$
-%include /usr/lib/rpm/macros.java
Summary: XML parser for Java
Summary(pl): Analizator składniowy XML-a napisany w Javie
Name: xerces-j
@@ -15,8 +14,9 @@
Source1:
http://www.apache.org/dist/xml/xerces-j/Xerces-J-tools.%{version}.tar.gz
# Source1-md5: 4206f318b43654552f16a9040bdfa6b4
URL: http://xml.apache.org/xerces-j/
-BuildRequires: jdk >= 1.1
BuildRequires: ant >= 1.5
+BuildRequires: jdk >= 1.1
+BuildRequires: rpmbuild(macros) >= 1.300
BuildRequires: xml-commons
Requires: jre >= 1.1
Requires: xml-commons
@@ -79,6 +79,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.28 2006/05/23 20:34:37 glen
+- rpmbuild(macros) >= 1.300 instead of macros.java rpm-javaprov
+
Revision 1.27 2006/05/23 18:33:32 radek
- license v2.0, more %doc
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/ant.spec?r1=1.54&r2=1.55&f=u
http://cvs.pld-linux.org/SPECS/aspectwerkz.spec?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/SPECS/castor.spec?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/SPECS/eclipse.spec?r1=1.65&r2=1.66&f=u
http://cvs.pld-linux.org/SPECS/fop.spec?r1=1.32&r2=1.33&f=u
http://cvs.pld-linux.org/SPECS/jacl.spec?r1=1.8&r2=1.9&f=u
http://cvs.pld-linux.org/SPECS/jakarta-log4j.spec?r1=1.26&r2=1.27&f=u
http://cvs.pld-linux.org/SPECS/java-gnu-mail.spec?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/SPECS/java-sun.spec?r1=1.137&r2=1.138&f=u
http://cvs.pld-linux.org/SPECS/jython.spec?r1=1.19&r2=1.20&f=u
http://cvs.pld-linux.org/SPECS/qdox.spec?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/SPECS/statcvs.spec?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/SPECS/xalan-j.spec?r1=1.22&r2=1.23&f=u
http://cvs.pld-linux.org/SPECS/xerces-j.spec?r1=1.27&r2=1.28&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
