Author: glen Date: Sun Oct 23 12:36:38 2011 GMT
Module: packages Tag: SOURCE
---- Log message:
- updated deps, no progress with building
---- Files affected:
packages/java-dom4j:
dom4j-build_xml.patch (1.1 -> 1.1.2.1) , java-dom4j.spec (1.8 -> 1.8.2.1)
---- Diffs:
================================================================
Index: packages/java-dom4j/dom4j-build_xml.patch
diff -u packages/java-dom4j/dom4j-build_xml.patch:1.1
packages/java-dom4j/dom4j-build_xml.patch:1.1.2.1
--- packages/java-dom4j/dom4j-build_xml.patch:1.1 Sun Dec 2 18:54:03 2007
+++ packages/java-dom4j/dom4j-build_xml.patch Sun Oct 23 14:36:33 2011
@@ -1,6 +1,28 @@
---- build.xml.sav 2005-08-16 18:55:33.000000000 +0200
-+++ build.xml 2005-08-16 18:57:46.000000000 +0200
-@@ -191,6 +191,7 @@
+--- build.xml.sav 2007-02-16 01:51:43.000000000 -0500
++++ build.xml 2007-02-16 02:07:51.000000000 -0500
+@@ -9,6 +9,11 @@
+ </fileset>
+ </path>
+
++ <path id="boot.compile.classpath">
++ <pathelement location="/usr/share/java/jaxp12.jar"/>
++ <pathelement location="/usr/lib/jvm/java/jre/lib/rt.jar"/>
++ </path>
++
+ <path id="endorsed.classpath">
+ <fileset dir="./lib/endorsed">
+ <include name="*.jar" />
+@@ -145,7 +150,8 @@
+ target="1.3"
+ source="1.3"
+ deprecation="${deprecation}"
+- classpathref="compile.classpath">
++ classpathref="compile.classpath"
++ bootclasspathref="boot.compile.classpath">
+ </javac>
+ </target>
+
+@@ -191,6 +197,7 @@
<javadoc packagenames="${packages}"
sourcepath="${build.src}"
destdir="${build.javadocs}"
@@ -8,7 +30,7 @@
author="true"
version="true"
use="true"
-@@ -210,6 +211,7 @@
+@@ -210,6 +217,7 @@
<javadoc packagenames="${packages}"
sourcepath="${build.src}"
destdir="${build.javadocs}"
@@ -16,7 +38,7 @@
author="true"
version="true"
use="true"
-@@ -227,6 +229,7 @@
+@@ -227,6 +235,7 @@
<javadoc packagenames="${api.packages}"
sourcepath="${build.src}"
destdir="${build.apidocs}"
@@ -24,7 +46,7 @@
author="true"
version="true"
use="true"
-@@ -335,10 +338,10 @@
+@@ -335,10 +344,10 @@
<target name="prepare-jaxb" depends="prepare-samples">
<path id="classpath.jaxb">
================================================================
Index: packages/java-dom4j/java-dom4j.spec
diff -u packages/java-dom4j/java-dom4j.spec:1.8
packages/java-dom4j/java-dom4j.spec:1.8.2.1
--- packages/java-dom4j/java-dom4j.spec:1.8 Sun Apr 18 16:33:47 2010
+++ packages/java-dom4j/java-dom4j.spec Sun Oct 23 14:36:33 2011
@@ -2,15 +2,14 @@
#
# Conditional build:
%bcond_with bootstrap # boostrap
-#
+
%define srcname dom4j
-#
%include /usr/lib/rpm/macros.java
Summary: DOM4J - Open Source XML framework for Java
Summary(pl.UTF-8): Szkielet XML z otwartymi źródłami dla Javy
Name: java-%{srcname}
Version: 1.6.1
-Release: 0.1
+Release: 0.2
License: BSD-style
Group: Applications/Text
Source0:
http://downloads.sourceforge.net/dom4j/%{srcname}-%{version}.tar.gz
@@ -19,21 +18,20 @@
Patch0: %{srcname}-build_xml.patch
URL: http://www.dom4j.org/
%if %{with bootstrap}
-BuildRequires: jaxen-bootstrap >= 0:1.1-1
+BuildRequires: jaxen-bootstrap >= 1.1-1
%else
-#BuildRequires: jaxen >= 0:1.1-2
+#BuildRequires: jaxen >= 1.1-2
%endif
-BuildRequires: ant >= 0:1.6
+BuildRequires: ant >= 1.6
#BuildRequires: bea-stax
#BuildRequires: bea-stax-api
#BuildRequires: isorelax
+BuildRequires: java(jaxp_parser_impl)
+BuildRequires: java-junit
BuildRequires: java-xalan
-BuildRequires: java-xerces
-BuildRequires: java-xml-commons-apis
-BuildRequires: jdk < 1.6
-BuildRequires: jpackage-utils >= 0:1.6
+BuildRequires: java-xml-commons
+BuildRequires: jpackage-utils >= 1.6
BuildRequires: jtidy
-BuildRequires: junit
#BuildRequires: junitperf
#BuildRequires: msv-msv
#BuildRequires: msv-xsdlib
@@ -42,16 +40,16 @@
#BuildRequires: ws-jaxme
#BuildRequires: xpp2
#BuildRequires: xpp3
-Requires: bea-stax
-Requires: bea-stax-api
-Requires: isorelax
+#Requires: bea-stax
+#Requires: bea-stax-api
+#Requires: isorelax
+Requires: java(jaxp_parser_impl)
Requires: java-xalan
-Requires: java-xerces
Requires: java-xml-commons-apis
Requires: msv-msv
Requires: msv-xsdlib
Requires: relaxngDatatype
-Requires: ws-jaxme
+#Requires: ws-jaxme
Requires: xpp2
Requires: xpp3
%if %{with bootstrap}
@@ -193,12 +191,12 @@
# jars
install -d $RPM_BUILD_ROOT%{_javadir}
-cp -a build/%{srcname}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
+cp -p build/%{srcname}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
ln -s %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
# javadoc
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
-cp -a build/doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+cp -p build/doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost
# manual
@@ -211,7 +209,7 @@
install -d $RPM_BUILD_ROOT%{_datadir}/%{srcname}-%{version}/src
cp -a src/samples $RPM_BUILD_ROOT%{_datadir}/%{srcname}-%{version}/src
cp -a build/classes/org/dom4j/samples
$RPM_BUILD_ROOT%{_datadir}/%{srcname}-%{version}/classes/org/dom4j
-install run.sh $RPM_BUILD_ROOT%{_datadir}/%{srcname}-%{version}
+install -p run.sh $RPM_BUILD_ROOT%{_datadir}/%{srcname}-%{version}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -244,6 +242,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.8.2.1 2011/10/23 12:36:33 glen
+- updated deps, no progress with building
+
Revision 1.8 2010/04/18 14:33:47 pawelz
- updated java deps
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-dom4j/dom4j-build_xml.patch?r1=1.1&r2=1.1.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-dom4j/java-dom4j.spec?r1=1.8&r2=1.8.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
