SPECS: dom4j.spec - do not kill all bundled jars

[glen]

Author: glen                         Date: Sun Dec  2 18:09:09 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- do not kill all bundled jars

---- Files affected:
SPECS:
   dom4j.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/dom4j.spec
diff -u SPECS/dom4j.spec:1.1 SPECS/dom4j.spec:1.2
--- SPECS/dom4j.spec:1.1	Sun Dec  2 18:53:41 2007
+++ SPECS/dom4j.spec	Sun Dec  2 19:09:04 2007
@@ -17,27 +17,26 @@
 %if %{with bootstrap}
 BuildRequires:	jaxen-bootstrap >= 0:1.1-1
 %else
-BuildRequires:	jaxen >= 0:1.1-2
+#BuildRequires:	jaxen >= 0:1.1-2
 %endif
 BuildRequires:	ant >= 0:1.6
-BuildRequires:	bea-stax
-BuildRequires:	bea-stax-api
-BuildRequires:	isorelax
-BuildRequires:	jpackage-utils
+#BuildRequires:	bea-stax
+#BuildRequires:	bea-stax-api
+#BuildRequires:	isorelax
 BuildRequires:	jpackage-utils >= 0:1.6
 BuildRequires:	jtidy
 BuildRequires:	junit
-BuildRequires:	junitperf
-BuildRequires:	msv-msv
-BuildRequires:	msv-xsdlib
-BuildRequires:	relaxngDatatype
+#BuildRequires:	junitperf
+#BuildRequires:	msv-msv
+#BuildRequires:	msv-xsdlib
+#BuildRequires:	relaxngDatatype
 BuildRequires:	rpmbuild(macros) >= 1.300
-BuildRequires:	ws-jaxme
+#BuildRequires:	ws-jaxme
 BuildRequires:	xalan-j
 BuildRequires:	xerces-j
 BuildRequires:	xml-commons-apis
-BuildRequires:	xpp2
-BuildRequires:	xpp3
+#BuildRequires:	xpp2
+#BuildRequires:	xpp3
 Requires:	isorelax
 Requires:	msv-msv
 Requires:	msv-xsdlib
@@ -91,8 +90,31 @@
 %setup -q
 # replace run.sh
 cp %{SOURCE1} run.sh
-# remove binary libs
+
+%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
@@ -104,34 +126,34 @@
 
 %build
 cd lib
-	ln -sf $(build-classpath xpp2)
-	ln -sf $(build-classpath relaxngDatatype)
+#	ln -sf $(build-classpath xpp2)
+#	ln -sf $(build-classpath relaxngDatatype)
 	cd endorsed
 		ln -sf $(build-classpath xml-commons-apis)
-	cd -
-	ln -sf $(build-classpath jaxme/jaxmeapi)
-	ln -sf $(build-classpath msv-xsdlib)
-	ln -sf $(build-classpath msv-msv)
-	ln -sf $(build-classpath jaxen)
-	ln -sf $(build-classpath bea-stax-api)
+	cd ..
+#	ln -sf $(build-classpath jaxme/jaxmeapi)
+#	ln -sf $(build-classpath msv-xsdlib)
+#	ln -sf $(build-classpath msv-msv)
+#	ln -sf $(build-classpath jaxen)
+#	ln -sf $(build-classpath bea-stax-api)
 	cd test
-		ln -sf $(build-classpath bea-stax-ri)
-		ln -sf $(build-classpath junitperf)
+#		ln -sf $(build-classpath bea-stax-ri)
+#		ln -sf $(build-classpath junitperf)
 		ln -sf $(build-classpath junit)
-	cd -
-	ln -sf $(build-classpath xpp3)
+	cd ..
+#	ln -sf $(build-classpath xpp3)
 	cd tools
-		ln -sf $(build-classpath jaxme/jaxmexs)
-		ln -sf $(build-classpath xalan-j2)
-		ln -sf $(build-classpath jaxme/jaxmejs)
+#		ln -sf $(build-classpath jaxme/jaxmexs)
+		ln -sf $(build-classpath xalan)
+#		ln -sf $(build-classpath jaxme/jaxmejs)
 		ln -sf $(build-classpath jtidy)
-		ln -sf $(build-classpath isorelax)
-		ln -sf $(build-classpath jaxme/jaxme2)
-		ln -sf $(build-classpath xerces-j2)
-	cd -
-cd -
+#		ln -sf $(build-classpath isorelax)
+#		ln -sf $(build-classpath jaxme/jaxme2)
+		ln -sf $(build-classpath xercesImpl)
+	cd ..
+cd ..
 
-%ant all samples test
+%ant package samples test
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -191,6 +213,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2007-12-02 18:09:04  glen
+- do not kill all bundled jars
+
 Revision 1.1  2007-12-02 17:53:41  glen
 - initial, based on jpackage-1.7
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/dom4j.spec?r1=1.1&r2=1.2&f=u