SPECS: java-xml-commons.spec - Apache license version - versioned ant R nee...

[pawelz]

Author: pawelz                       Date: Tue Mar 31 15:28:40 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- Apache license version
- versioned ant R needed only when building with gcj
- we are not the xml-commons community (removed from description)

---- Files affected:
SPECS:
   java-xml-commons.spec (1.28 -> 1.29) 

---- Diffs:

================================================================
Index: SPECS/java-xml-commons.spec
diff -u SPECS/java-xml-commons.spec:1.28 SPECS/java-xml-commons.spec:1.29
--- SPECS/java-xml-commons.spec:1.28	Tue Mar 31 14:57:59 2009
+++ SPECS/java-xml-commons.spec	Tue Mar 31 17:28:34 2009
@@ -17,7 +17,7 @@
 Name:		java-%{srcname}
 Version:	1.0
 Release:	0.%{subver}.%{rel}
-License:	Apache
+License:	Apache v2.0
 Group:		Libraries/Java
 Source0:	http://www.apache.org/dist/xml/commons/%{srcname}-%{version}.%{subver}.tar.gz
 # Source0-md5:	6c6551ece56948ee535d5f5014489b8d
@@ -25,9 +25,13 @@
 Patch1:		%{srcname}.manifest.patch
 URL:		http://xml.apache.org/commons/
 # ant >= 1.7.1-3 is required because of ant-gcjtask.patch
+%if %{with java_sun}
+BuildRequires:	ant
+BuildRequires:	java-sun
+%else
 BuildRequires:	ant >= 1.7.1-3
-%{!?with_java_sun:BuildRequires:        java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires: java-sun}
+BuildRequires:	java-gcj-compat-devel
+%endif
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
@@ -45,11 +49,6 @@
 various externally-defined standards code relating to XML - things
 like the DOM, SAX, and JAXP interfaces.
 
-As the xml-commons community forms, we also hope to serve as a holding
-area for other common xml-related utilities and code, and to help
-promulgate common packaging, testing, documentation, and other
-guidelines across all xml.apache.org subprojects.
-
 %description -l pl.UTF-8
 Projekt xml-commons koncentruje się na wspólnym kodzie i wytycznych
 dla projektów XML. Pierwszym celem będzie zorganizowanie i
@@ -120,6 +119,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.29  2009/03/31 15:28:34  pawelz
+- Apache license version
+- versioned ant R needed only when building with gcj
+- we are not the xml-commons community (removed from description)
+
 Revision 1.28  2009/03/31 12:57:59  paszczus
 - it can also be build with java-sun so bcond java_sun added
 - rel 6
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-xml-commons.spec?r1=1.28&r2=1.29&f=u