SPECS: xalan-j.spec - Release: 4 - CVS conflict artefacts removed
jajcus
jajcus at pld-linux.org
Wed May 24 15:05:05 CEST 2006
Author: jajcus Date: Wed May 24 13:05:05 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- Release: 4
- CVS conflict artefacts removed
---- Files affected:
SPECS:
xalan-j.spec (1.26 -> 1.27)
---- Diffs:
================================================================
Index: SPECS/xalan-j.spec
diff -u SPECS/xalan-j.spec:1.26 SPECS/xalan-j.spec:1.27
--- SPECS/xalan-j.spec:1.26 Wed May 24 15:00:27 2006
+++ SPECS/xalan-j.spec Wed May 24 15:05:00 2006
@@ -11,7 +11,7 @@
Summary(pl): Procesor XSLT napisany w Javie
Name: xalan-j
Version: 2.6.0
-Release: 3
+Release: 4
License: Apache v2.0
Group: Applications/Publishing/XML/Java
Source0: http://www.apache.org/dist/xml/xalan-j/source/%{name}_%{_ver}-src.tar.gz
@@ -82,12 +82,7 @@
ln -sf %{_javadir}/regexp.jar bin/regexp.jar
ln -sf %{_javadir}/java_cup-runtime.jar bin/runtime.jar
-<<<<<<< xalan-j.spec
-
%{ant} xsltc.unbundledjar servlet %{?with_docs:docs xsltc.docs javadocs samples}
-=======
-%{ant} xsltc.unbundledjar docs xsltc.docs javadocs samples servlet
->>>>>>> 1.25
%install
rm -rf $RPM_BUILD_ROOT
@@ -128,6 +123,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.27 2006/05/24 13:05:00 jajcus
+- Release: 4
+- CVS conflict artefacts removed
+
Revision 1.26 2006/05/24 13:00:27 jajcus
- Release: 3
- without_docs bcond
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/xalan-j.spec?r1=1.26&r2=1.27&f=u
More information about the pld-cvs-commit
mailing list