Author: glen Date: Wed Feb 9 17:32:01 2011 GMT Module: packages Tag: HEAD ---- Log message: - use java(jaxp_parser_impl) virtual dep instead of direct java-xerces so java-sun can satisfy; rel 3
---- Files affected: packages/java-commons-dbcp: java-commons-dbcp.spec (1.32 -> 1.33) ---- Diffs: ================================================================ Index: packages/java-commons-dbcp/java-commons-dbcp.spec diff -u packages/java-commons-dbcp/java-commons-dbcp.spec:1.32 packages/java-commons-dbcp/java-commons-dbcp.spec:1.33 --- packages/java-commons-dbcp/java-commons-dbcp.spec:1.32 Fri Apr 23 02:02:13 2010 +++ packages/java-commons-dbcp/java-commons-dbcp.spec Wed Feb 9 18:31:55 2011 @@ -4,14 +4,14 @@ # # Conditional build: %bcond_without javadoc # don't build javadoc -%include /usr/lib/rpm/macros.java %define srcname commons-dbcp +%include /usr/lib/rpm/macros.java Summary: Commons DBCP - database connection pooling Summary(pl.UTF-8): Commons DBCP - zarządzanie połączeniem z bazą danych Name: java-commons-dbcp Version: 1.2.2 -Release: 2 +Release: 3 License: Apache v2.0 Group: Libraries/Java Source0: http://www.apache.org/dist/commons/dbcp/source/commons-dbcp-%{version}-src.tar.gz @@ -21,12 +21,12 @@ Patch1: jakarta-commons-dbcp-javadoc.patch URL: http://commons.apache.org/dbcp/ BuildRequires: ant +BuildRequires: java(jaxp_parser_impl) BuildRequires: java-commons-collections BuildRequires: java-commons-collections-tomcat5 BuildRequires: java-commons-pool >= 1.2 BuildRequires: java-commons-pool-tomcat5 BuildRequires: jdk -BuildRequires: java-xerces BuildRequires: jpackage-utils BuildRequires: rpm-javaprov BuildRequires: rpmbuild(macros) >= 1.300 @@ -79,7 +79,7 @@ Summary: Commons DBCP dependency for Tomcat5 Summary(pl.UTF-8): Elementy Commons DBCP dla Tomcata 5 Group: Development/Languages/Java -Requires: java-xerces +Requires: java(jaxp_parser_impl) Provides: jakarta-commons-dbcp-tomcat5 Obsoletes: jakarta-commons-dbcp-source Obsoletes: jakarta-commons-dbcp-tomcat5 @@ -163,6 +163,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.33 2011/02/09 17:31:55 glen +- use java(jaxp_parser_impl) virtual dep instead of direct java-xerces so java-sun can satisfy; rel 3 + Revision 1.32 2010/04/23 00:02:13 pawelz - Don't force specific jdk. @@ -177,7 +180,7 @@ - use java-gcj-compat-devel - BR: java-xerces, tomcat5 subpackage R: java-xerces - correct dir for javadoc -- install less %%doc +- install less %doc - rel 2 Revision 1.28 2009/01/26 10:12:48 glen ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-commons-dbcp/java-commons-dbcp.spec?r1=1.32&r2=1.33&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
