packages: java-dom4j/java-dom4j.spec, java-dom4j/dom4j-build_xml.patch - me...
glen
glen at pld-linux.org
Sun Oct 23 16:24:57 CEST 2011
Author: glen Date: Sun Oct 23 14:24:57 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- merge build from SOURCE branch
---- Files affected:
packages/java-dom4j:
java-dom4j.spec (1.10 -> 1.11) , dom4j-build_xml.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: packages/java-dom4j/java-dom4j.spec
diff -u packages/java-dom4j/java-dom4j.spec:1.10 packages/java-dom4j/java-dom4j.spec:1.11
--- packages/java-dom4j/java-dom4j.spec:1.10 Mon Jun 14 19:43:32 2010
+++ packages/java-dom4j/java-dom4j.spec Sun Oct 23 16:24:52 2011
@@ -1,21 +1,68 @@
# $Revision$, $Date$
-# TODO:
-# - build from source. See SOURCE branch for unfinished work.
-
-%include /usr/lib/rpm/macros.java
+# TODO
+# - tests: org.dom4j.io.StaxTest failed
+#
+# Conditional build:
+%bcond_with bootstrap # boostrap
+%bcond_without javadoc # don't build javadoc
+%bcond_with tests # don't build and run tests
+
%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-dom4j
Version: 1.6.1
-Release: 0.1
+Release: 1
License: BSD-style
Group: Applications/Text
-Source0: http://downloads.sourceforge.net/project/dom4j/dom4j/1.6.1/dom4j-%{version}.jar
-# Source0-md5: 4d8f51d3fe3900efc6e395be48030d6d
+Source0: http://downloads.sourceforge.net/dom4j/%{srcname}-%{version}.tar.gz
+# Source0-md5: 1e7ef6d20939315714de4a8502f27b2d
Source1: %{srcname}-rundemo.sh
+Patch0: %{srcname}-build_xml.patch
+Patch1: dom4j-java5.patch
URL: http://www.dom4j.org/
+%if %{with bootstrap}
+BuildRequires: jaxen-bootstrap >= 1.1-1
+%else
+#BuildRequires: jaxen >= 1.1-2
+%endif
+BuildRequires: ant >= 1.6
+#BuildRequires: bea-stax
+#BuildRequires: bea-stax-api
+#BuildRequires: isorelax
+BuildRequires: java(jaxp_parser_impl)
+BuildRequires: java-jaxme
+BuildRequires: java-junit
+BuildRequires: java-xalan
+BuildRequires: java-xml-commons
+BuildRequires: jpackage-utils >= 1.6
+BuildRequires: jtidy
+#BuildRequires: junitperf
+#BuildRequires: msv-msv
+#BuildRequires: msv-xsdlib
+#BuildRequires: relaxngDatatype
+BuildRequires: rpmbuild(macros) >= 1.300
+#BuildRequires: xpp2
+#BuildRequires: xpp3
+#Requires: bea-stax
+#Requires: bea-stax-api
+#Requires: isorelax
+Requires: java(jaxp_parser_impl)
+Requires: java-jaxme
+Requires: java-xalan
+Requires: java-xml-commons-apis
+Requires: msv-msv
+Requires: msv-xsdlib
+Requires: relaxngDatatype
+Requires: xpp2
+Requires: xpp3
+%if %{with bootstrap}
+Requires: jaxen-bootstrap >= 0:1.1-1
+%else
+#Requires: jaxen >= 0:1.1-1
+%endif
+Obsoletes: dom4j
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -31,31 +78,179 @@
z DOM i SAX, jest w sposób przezroczysty zintegrowany z pełną obsługą
XPath.
+%package demo
+Summary: Samples for %{srcname}
+Summary(pl.UTF-8): Przykłady do pakietu %{srcname}
+Group: Documentation
+Requires: %{name} = %{version}-%{release}
+Obsoletes: dom4j-demo
+
+%description demo
+Samples for %{srcname}.
+
+%description demo -l pl.UTF-8
+Przykłady do pakietu %{srcname}.
+
+%package manual
+Summary: Manual for %{srcname}
+Summary(pl.UTF-8): Podręcznik do pakietu %{srcname}
+Group: Documentation
+Requires: jpackage-utils
+Obsoletes: dom4j-manual
+
+%description manual
+Documentation for %{srcname}.
+
+%description manual -l pl.UTF-8
+Podręcznik do pakietu %{srcname}.
+
+%package javadoc
+Summary: Javadoc for %{srcname}
+Summary(pl.UTF-8): Dokumentacja Javadoc do pakietu %{srcname}
+Group: Documentation
+Obsoletes: dom4j-javadoc
+
+%description javadoc
+Javadoc for %{srcname}.
+
+%description javadoc -l pl.UTF-8
+Dokumentacja Javadoc do pakietu %{srcname}.
+
%prep
-%setup -q -T -c
+%setup -q -n %{srcname}-%{version}
+# replace run.sh
+install -p %{SOURCE1} run.sh
+
+%if "%{version}" == "1.6.1"
+rm -f lib/endorsed/xml-apis-2.0.2.jar
+#rm -f lib/test/jsr173_1.0_ri.jar
+rm -f lib/test/junit-3.8.1.jar
+#rm -f lib/test/junitperf-1.8.jar
+#rm -f lib/tools/isorelax-20030108.jar
+rm -f lib/tools/jaxme-0.3.jar
+rm -f lib/tools/jaxme-js-0.3.jar
+rm -f lib/tools/jaxme-xs-0.3.jar
+rm -f lib/tools/jtidy-4aug2000r7-dev.jar
+rm -f lib/tools/xalan-2.5.1.jar
+rm -f lib/tools/xercesImpl-2.6.2.jar
+#rm -f lib/jaxen-1.1-beta-6.jar
+rm -f lib/jaxme-api-0.3.jar
+#rm -f lib/jsr173_1.0_api.jar
+#rm -f lib/msv-20030807.jar
+#rm -f lib/pull-parser-2.1.10.jar
+#rm -f lib/relaxngDatatype-20030807.jar
+#rm -f lib/xpp3-1.1.3.3.jar
+#rm -f lib/xsdlib-20030807.jar
+rm -f dom4j-1.6.1.jar
+%else
+find -name '*.jar' | xargs rm -vf
+%endif
+
+# function matrix-concat not available
+rm -f src/test/org/dom4j/xpath/MatrixConcatTest.java
+# won't succeed in headless environment
+rm src/test/org/dom4j/bean/BeansTest.java
+# fix for deleted jars
+sed -i -e '/unjar/d' -e 's|,cookbook/\*\*,|,|' build.xml
+%undos build.xml
+%patch0 -p0
+%undos -f java
+%patch1 -p1
+
+rm -rf docs/apidocs
+
+%build
+cd lib
+# ln -sf $(find-jar xpp2)
+# ln -sf $(find-jar relaxngDatatype)
+ cd endorsed
+ ln -sf $(find-jar xml-commons-apis)
+ cd ..
+ ln -sf $(find-jar jaxme/jaxmeapi)
+# ln -sf $(find-jar msv-xsdlib)
+# ln -sf $(find-jar msv-msv)
+# ln -sf $(find-jar jaxen)
+# ln -sf $(find-jar bea-stax-api)
+ cd test
+# ln -sf $(find-jar bea-stax-ri)
+# ln -sf $(find-jar junitperf)
+ ln -sf $(find-jar junit)
+ cd ..
+# ln -sf $(find-jar xpp3)
+ cd tools
+ ln -sf $(find-jar jaxme/jaxmexs)
+ ln -sf $(find-jar xalan)
+ ln -sf $(find-jar jaxme/jaxmejs)
+ ln -sf $(find-jar jtidy)
+# ln -sf $(find-jar isorelax)
+ ln -sf $(find-jar jaxme/jaxme2)
+ ln -sf $(find-jar xercesImpl)
+ cd ..
+cd ..
+
+%ant package samples %{?with_javadoc:javadoc} %{?with_tests:test}
%install
rm -rf $RPM_BUILD_ROOT
# jars
install -d $RPM_BUILD_ROOT%{_javadir}
-cp -a %{SOURCE0} $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
+%if %{with javadoc}
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+cp -a build/doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost
+%endif
+
+# manual
+install -d $RPM_BUILD_ROOT%{_docdir}/%{srcname}-manual-%{version}
+cp -a docs/* $RPM_BUILD_ROOT%{_docdir}/%{srcname}-manual-%{version}
+
+# demo
+install -d $RPM_BUILD_ROOT%{_datadir}/%{srcname}-%{version}/classes/org/dom4j
+cp -a xml $RPM_BUILD_ROOT%{_datadir}/%{srcname}-%{version}
+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 -p run.sh $RPM_BUILD_ROOT%{_datadir}/%{srcname}-%{version}
+
%clean
rm -rf $RPM_BUILD_ROOT
+%post javadoc
+ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname}
+
%files
%defattr(644,root,root,755)
+%doc LICENSE.txt
%{_javadir}/%{srcname}.jar
%{_javadir}/%{srcname}-%{version}.jar
+%files demo
+%defattr(644,root,root,755)
+%{_datadir}/%{srcname}-%{version}
+
+%files javadoc
+%defattr(644,root,root,755)
+%{_javadocdir}/%{srcname}-%{version}
+%ghost %{_javadocdir}/%{srcname}
+
+%files manual
+%defattr(644,root,root,755)
+%{_docdir}/%{srcname}-manual-%{version}
+
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <feedback at pld-linux.org>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.11 2011/10/23 14:24:52 glen
+- merge build from SOURCE branch
+
Revision 1.10 2010/06/14 17:43:32 pawelz
- md5
- drop %post for nonexistent subpackage
@@ -63,6 +258,12 @@
Revision 1.9 2010/06/14 17:36:07 pawelz
- it does not build, so save it on SOURCE branch and package binary file on HEAD
+
+Revision 1.8.2.2 2011/10/23 14:14:09 glen
+- builds now, without tests
+
+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
================================================================
Index: packages/java-dom4j/dom4j-build_xml.patch
diff -u /dev/null packages/java-dom4j/dom4j-build_xml.patch:1.3
--- /dev/null Sun Oct 23 16:24:57 2011
+++ packages/java-dom4j/dom4j-build_xml.patch Sun Oct 23 16:24:52 2011
@@ -0,0 +1,63 @@
+--- 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}"
++ classpathref="compile.classpath"
+ author="true"
+ version="true"
+ use="true"
+@@ -210,6 +217,7 @@
+ <javadoc packagenames="${packages}"
+ sourcepath="${build.src}"
+ destdir="${build.javadocs}"
++ classpathref="compile.classpath"
+ author="true"
+ version="true"
+ use="true"
+@@ -227,6 +235,7 @@
+ <javadoc packagenames="${api.packages}"
+ sourcepath="${build.src}"
+ destdir="${build.apidocs}"
++ classpathref="compile.classpath"
+ author="true"
+ version="true"
+ use="true"
+@@ -335,10 +344,10 @@
+
+ <target name="prepare-jaxb" depends="prepare-samples">
+ <path id="classpath.jaxb">
+- <pathelement location="./lib/tools/jaxme-0.3.jar"/>
+- <pathelement location="./lib/tools/jaxme-js-0.3.jar"/>
+- <pathelement location="./lib/tools/jaxme-xs-0.3.jar"/>
+- <pathelement location="./lib/jaxme-api-0.3.jar"/>
++ <pathelement location="./lib/tools/jaxme2.jar"/>
++ <pathelement location="./lib/tools/jaxmejs.jar"/>
++ <pathelement location="./lib/tools/jaxmexs.jar"/>
++ <pathelement location="./lib/jaxmeapi.jar"/>
+ </path>
+
+ <taskdef name="xjc" classname="org.apache.ws.jaxme.generator.XJCTask">
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-dom4j/java-dom4j.spec?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-dom4j/dom4j-build_xml.patch?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list