SPECS: java-struts.spec - O:jakarta-struts - sorted BRs

[pawelz]

Author: pawelz                       Date: Fri Jan 23 16:44:51 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- O:jakarta-struts
- sorted BRs

---- Files affected:
SPECS:
   java-struts.spec (1.21 -> 1.22) 

---- Diffs:

================================================================
Index: SPECS/java-struts.spec
diff -u SPECS/java-struts.spec:1.21 SPECS/java-struts.spec:1.22
--- SPECS/java-struts.spec:1.21	Fri Jan 23 17:38:04 2009
+++ SPECS/java-struts.spec	Fri Jan 23 17:44:46 2009
@@ -15,6 +15,7 @@
 #BuildRequires:	ant-nodeps
 #BuildRequires:	ant-trax
 #BuildRequires:	antlr >= 2.7.2
+#BuildRequires:	jakarta-oro >= 2.0.7
 #BuildRequires:	java-commons-beanutils >= 1.6.1
 #BuildRequires:	java-commons-collections
 #BuildRequires:	java-commons-digester >= 1.5
@@ -22,12 +23,12 @@
 #BuildRequires:	java-commons-lang
 #BuildRequires:	java-commons-logging >= 1.0.3
 #BuildRequires:	java-commons-validator >= 1.1.0
-#BuildRequires:	jakarta-oro >= 2.0.7
 BuildRequires:	jdbc-stdext >= 2.0-2
 #BuildRequires:	jpackage-utils
 BuildRequires:	maven >= 2
 BuildRequires:	rpmbuild(macros) >= 1.300
 #BuildRequires:	servlet5
+Requires:	jakarta-oro
 Requires:	java-commons-beanutils
 Requires:	java-commons-collections
 Requires:	java-commons-digester
@@ -35,9 +36,9 @@
 Requires:	java-commons-lang
 Requires:	java-commons-logging >= 1.0.3
 Requires:	java-commons-validator
-Requires:	jakarta-oro
 Requires:	jdbc-stdext >= 2.0
 Requires:	servlet
+Obsoletes:	jakarta-struts
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -86,6 +87,7 @@
 Summary:	Struts framework documentation
 Summary(pl.UTF-8):	Dokumentacja do środowiska Struts
 Group:		Documentation
+Obsoletes:	jakarta-struts-doc
 
 %description doc
 Struts framework documentation.
@@ -99,6 +101,7 @@
 Group:		Development/Languages/Java
 Requires:	%{name} = %{version}-%{release}
 Requires:	apache-tomcat
+Obsoletes:	jakarta-struts-webapps
 
 %description webapps
 Sample Struts webapps for tomcat.
@@ -266,6 +269,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2009/01/23 16:44:46  pawelz
+- O:jakarta-struts
+- sorted BRs
+
 Revision 1.21  2009/01/23 16:38:04  pawelz
 - struts, commons and tomcat are no longer parts of jakarta project
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-struts.spec?r1=1.21&r2=1.22&f=u