rpms/struts/devel struts.spec,1.44,1.45
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Mar 27 17:43:34 UTC 2007
Author: dbhole
Update of /cvs/dist/rpms/struts/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28719
Modified Files:
struts.spec
Log Message:
- Rewrote pre/preun/post/postun dependencies
- Change Pre[rR]eq -> Requires(pre)
- Add unowned directory to folders section. bz# 233821.
Index: struts.spec
===================================================================
RCS file: /cvs/dist/rpms/struts/devel/struts.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- struts.spec 30 Aug 2006 21:39:53 -0000 1.44
+++ struts.spec 27 Mar 2007 17:43:31 -0000 1.45
@@ -51,7 +51,7 @@
Name: struts
Version: 1.2.9
-Release: 4jpp.2
+Release: 4jpp.6
Epoch: 0
Summary: Web application framework
License: Apache License
@@ -71,11 +71,11 @@
Url: http://struts.apache.org/
Requires: servletapi5
Requires: jdbc-stdext
-PreReq: jakarta-commons-beanutils
-PreReq: jakarta-commons-digester
-PreReq: jakarta-commons-fileupload
-PreReq: jakarta-commons-validator
-PreReq: oro
+Requires: jakarta-commons-beanutils
+Requires: jakarta-commons-digester
+Requires: jakarta-commons-fileupload
+Requires: jakarta-commons-validator
+Requires: oro
BuildRequires: jpackage-utils >= 1.6
BuildRequires: ant >= 1.6
BuildRequires: antlr
@@ -163,7 +163,22 @@
Summary: Sample %{name} webapps for tomcat3
Group: Development/Java
Requires: %{name} = %{version}-%{release}
-Requires: tomcat3
+Requires: jakarta-commons-beanutils
+Requires: jakarta-commons-digester
+Requires: jakarta-commons-fileupload
+Requires: jakarta-commons-validator
+Requires: oro
+Requires: tomcat3
+Requires(post): %{name} = %{version}-%{release}
+Requires(post): jakarta-commons-beanutils
+Requires(post): jakarta-commons-digester
+Requires(post): jakarta-commons-fileupload
+Requires(post): jakarta-commons-validator
+Requires(post): oro
+Requires(post): tomcat3
+Requires(pre): tomcat3
+Requires(post): /bin/ln
+Requires(preun): /bin/rm
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
@@ -178,7 +193,22 @@
Summary: Sample %{name} webapps for tomcat4
Group: Development/Java
Requires: %{name} = %{version}-%{release}
-Requires: tomcat4
+Requires: jakarta-commons-beanutils
+Requires: jakarta-commons-digester
+Requires: jakarta-commons-fileupload
+Requires: jakarta-commons-validator
+Requires: oro
+Requires: tomcat4
+Requires(post): %{name} = %{version}-%{release}
+Requires(post): jakarta-commons-beanutils
+Requires(post): jakarta-commons-digester
+Requires(post): jakarta-commons-fileupload
+Requires(post): jakarta-commons-validator
+Requires(post): oro
+Requires(post): tomcat4
+Requires(pre): tomcat4
+Requires(post): /bin/ln
+Requires(preun): /bin/rm
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
@@ -194,7 +224,22 @@
Summary: Sample %{name} webapps for tomcat5
Group: Development/Java
Requires: %{name} = %{version}-%{release}
-Prereq: tomcat5
+Requires: jakarta-commons-beanutils
+Requires: jakarta-commons-digester
+Requires: jakarta-commons-fileupload
+Requires: jakarta-commons-validator
+Requires: oro
+Requires: tomcat5
+Requires(post): %{name} = %{version}-%{release}
+Requires(post): jakarta-commons-beanutils
+Requires(post): jakarta-commons-digester
+Requires(post): jakarta-commons-fileupload
+Requires(post): jakarta-commons-validator
+Requires(post): oro
+Requires(post): tomcat5
+Requires(pre): tomcat5
+Requires(post): /bin/ln
+Requires(preun): /bin/rm
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
@@ -210,7 +255,7 @@
Summary: The %{name} Chain Of Responsibility Adapter
Group: Development/Java
Requires: %{name} = %{version}-%{release}
-Prereq: jakarta-commons-chain
+Requires: jakarta-commons-chain
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
@@ -233,10 +278,15 @@
%package chain-webapps-tomcat5
Summary: Sample %{name} chain adapter webapps for tomcat5
Group: Development/Java
-PreReq: %{name} = %{version}-%{release}
-PreReq: %{name}-chain = %{version}-%{release}
-Prereq: tomcat5
-Prereq: jakarta-commons-chain
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-chain = %{version}-%{release}
+Requires: tomcat5
+Requires: jakarta-commons-chain
+Requires(post): %{name}-chain = %{version}-%{release}
+Requires(post): tomcat5
+Requires(pre): tomcat5
+Requires(post): jakarta-commons-chain
+Requires(preun): /bin/rm
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
@@ -253,7 +303,7 @@
Summary: The %{name} EL extension
Group: Development/Java
Requires: %{name} = %{version}-%{release}
-Prereq: jakarta-taglibs-standard
+Requires: jakarta-taglibs-standard
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
@@ -282,10 +332,16 @@
%package el-webapps-tomcat5
Summary: Sample %{name} EL extension webapps for tomcat5
Group: Development/Java
-PreReq: %{name} = %{version}-%{release}
-PreReq: %{name}-el = %{version}-%{release}
-Prereq: tomcat5
-Prereq: jakarta-taglibs-standard
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-el = %{version}-%{release}
+Requires: tomcat5
+Requires: jakarta-taglibs-standard
+Requires(post): %{name} = %{version}-%{release}
+Requires(post): %{name}-el = %{version}-%{release}
+Requires(post): tomcat5
+Requires(pre): tomcat5
+Requires(post): jakarta-taglibs-standard
+Requires(preun): /bin/rm
%description el-webapps-tomcat5
%{summary}.
@@ -296,7 +352,7 @@
Summary: The %{name}-faces integration library
Group: Development/Java
Requires: %{name} = %{version}-%{release}
-Prereq: myfaces
+Requires: myfaces
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
@@ -327,11 +383,30 @@
%package faces-webapps-tomcat5
Summary: Sample %{name}-faces integration webapps for tomcat5
Group: Development/Java
-PreReq: %{name} = %{version}-%{release}
-PreReq: %{name}-faces = %{version}-%{release}
-Prereq: tomcat5
-Prereq: myfaces
-PreReq: jakarta-commons-collections
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-faces = %{version}-%{release}
+Requires: jakarta-commons-beanutils
+Requires: jakarta-commons-collections
+Requires: jakarta-commons-digester
+Requires: jakarta-commons-fileupload
+Requires: jakarta-commons-logging
+Requires: jakarta-commons-validator
+Requires: myfaces
+Requires: oro
+Requires: tomcat5
+Requires(post): %{name} = %{version}-%{release}
+Requires(post): %{name}-faces = %{version}-%{release}
+Requires(post): jakarta-commons-beanutils
+Requires(post): jakarta-commons-collections
+Requires(post): jakarta-commons-digester
+Requires(post): jakarta-commons-fileupload
+Requires(post): jakarta-commons-logging
+Requires(post): jakarta-commons-validator
+Requires(post): myfaces
+Requires(post): oro
+Requires(post): tomcat5
+Requires(pre): tomcat5
+Requires(preun): /bin/rm
%description faces-webapps-tomcat5
%{summary}.
@@ -821,6 +896,7 @@
%files
%defattr(-,root,root)
+%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/INSTALL
%doc %{_docdir}/%{name}-%{version}/README
%doc %{_docdir}/%{name}-%{version}/*.txt
@@ -835,6 +911,7 @@
%files manual
%defattr(-,root,root)
+%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/docs
%files javadoc
@@ -984,6 +1061,11 @@
%changelog
+* Tue Mar 27 2007 Deepak Bhole <dbhole at redhat.com> 1.2.9-4jpp.6
+- Rewrote pre/preun/post/postun dependencies
+- Change Pre[rR]eq -> Requires(pre)
+- Add unowned directory to folders section. bz# 233821.
+
* Wed Aug 30 2006 Deepak Bhole <dbhole at redhat.com> 1.2.9-4jpp.2
- Rebuilding.
More information about the fedora-cvs-commits
mailing list