rpms/struts/devel struts.spec,1.42,1.43

[fedora-cvs-commits at redhat.com]

Author: dbhole

Update of /cvs/dist/rpms/struts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4843

Modified Files:
	struts.spec 
Log Message:

Fix requirements




Index: struts.spec
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/struts.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- struts.spec	23 Aug 2006 23:11:34 -0000	1.42
+++ struts.spec	25 Aug 2006 17:52:13 -0000	1.43
@@ -51,7 +51,7 @@
 
 Name:		struts
 Version:	1.2.9
-Release:	3jpp.1
+Release:	4jpp.1
 Epoch:		0
 Summary:	Web application framework
 License:	Apache License
@@ -71,11 +71,11 @@
 Url:		http://struts.apache.org/
 Requires:	servletapi5
 Requires:	jdbc-stdext
-Requires:	jakarta-commons-beanutils
-Requires:	jakarta-commons-digester
-Requires:	jakarta-commons-fileupload
-Requires:	jakarta-commons-validator
-Requires:	oro
+PreReq:		jakarta-commons-beanutils
+PreReq:		jakarta-commons-digester
+PreReq:		jakarta-commons-fileupload
+PreReq:		jakarta-commons-validator
+PreReq:		oro
 BuildRequires:	jpackage-utils >= 1.6
 BuildRequires:	ant >= 1.6
 BuildRequires:	antlr
@@ -152,6 +152,8 @@
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -222,6 +224,8 @@
 %package chain-javadoc
 Summary:        Javadoc for %{name}-chain
 Group:          Development/Documentation
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description chain-javadoc
 %{summary}.
@@ -229,8 +233,8 @@
 %package chain-webapps-tomcat5
 Summary:        Sample %{name} chain adapter webapps for tomcat5
 Group:          Development/Java
-Requires:       %{name} = %{version}-%{release}
-Requires:       %{name}-chain = %{version}-%{release}
+PreReq:         %{name} = %{version}-%{release}
+PreReq:         %{name}-chain = %{version}-%{release}
 Prereq:         tomcat5
 Prereq:         jakarta-commons-chain
 
@@ -269,6 +273,8 @@
 %package el-javadoc
 Summary:        Javadoc for %{name}-el
 Group:          Development/Documentation
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description el-javadoc
 %{summary}.
@@ -276,8 +282,8 @@
 %package el-webapps-tomcat5
 Summary:        Sample %{name} EL extension webapps for tomcat5
 Group:          Development/Java
-Requires:       %{name} = %{version}-%{release}
-Requires:       %{name}-el = %{version}-%{release}
+PreReq:         %{name} = %{version}-%{release}
+PreReq:         %{name}-el = %{version}-%{release}
 Prereq:         tomcat5
 Prereq:         jakarta-taglibs-standard
 
@@ -312,6 +318,8 @@
 %package faces-javadoc
 Summary:        Javadoc for %{name}-faces
 Group:          Development/Documentation
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description faces-javadoc
 %{summary}.
@@ -319,10 +327,11 @@
 %package faces-webapps-tomcat5
 Summary:        Sample %{name}-faces integration webapps for tomcat5
 Group:          Development/Java
-Requires:       %{name} = %{version}-%{release}
-Requires:       %{name}-faces = %{version}-%{release}
+PreReq:         %{name} = %{version}-%{release}
+PreReq:         %{name}-faces = %{version}-%{release}
 Prereq:         tomcat5
 Prereq:         myfaces
+PreReq:         jakarta-commons-collections
 
 %description faces-webapps-tomcat5
 %{summary}.
@@ -975,6 +984,9 @@
 
 
 %changelog
+* Fri Aug 25 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.2.9-4jpp.1
+- Fix requirements
+
 * Tue Aug 22 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.2.9-3jpp.1
 - Merge with upstream for upgrade to 1.2.9
 - Use symlinks instead of actual files in WEB-INF/lib folders