[struts] Change oro dependencies to jakarta-oro
Stanislav Ochotnicky
sochotni at fedoraproject.org
Tue Mar 1 09:59:55 UTC 2011
commit 630ebf31d1ce7ccd5dfed0d4384cd2494ba2cc87
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Tue Mar 1 10:59:08 2011 +0100
Change oro dependencies to jakarta-oro
- Fix groups to be valid
struts.spec | 90 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 47 insertions(+), 43 deletions(-)
---
diff --git a/struts.spec b/struts.spec
index 6b8a48e..576713d 100644
--- a/struts.spec
+++ b/struts.spec
@@ -34,7 +34,7 @@
%define _with_coreonly 1
-# If you want only core modules to be built,
+# If you want only core modules to be built,
# give rpmbuild option '--with coreonly'
%define with_coreonly %{?_with_coreonly:1}%{!?_with_coreonly:0}
@@ -50,15 +50,15 @@
%define section free
# Disable check-buildroot
-%define __arch_install_post /usr/lib/rpm/check-rpaths
+%define __arch_install_post /usr/lib/rpm/check-rpaths
Name: struts
Version: 1.2.9
-Release: 8.12%{?dist}
+Release: 9%{?dist}
Epoch: 0
Summary: Web application framework
License: ASL 2.0
-Group: Development/Libraries/Java
+Group: Development/Libraries
Source0: %{name}-%{version}-src-RHCLEAN.tar.gz
Source2: tomcat4-context-allowlinking.xml
Source3: tomcat5-context-allowlinking.xml
@@ -79,7 +79,7 @@ Requires: jakarta-commons-beanutils
Requires: jakarta-commons-digester
Requires: jakarta-commons-fileupload
Requires: jakarta-commons-validator
-Requires: oro
+Requires: jakarta-oro
BuildRequires: jpackage-utils >= 1.6
BuildRequires: ant >= 1.6
BuildRequires: antlr
@@ -94,7 +94,7 @@ BuildRequires: jakarta-commons-digester
BuildRequires: jakarta-commons-fileupload
BuildRequires: jakarta-commons-logging
BuildRequires: jakarta-commons-validator
-BuildRequires: oro
+BuildRequires: jakarta-oro
BuildRequires: tomcat5
%if %{without_coreonly}
@@ -114,7 +114,7 @@ BuildRequires: myfaces
BuildRequires: xalan-j2
%endif
-Group: Development/Java
+Group: Development/Libraries
%if ! %{gcj_support}
Buildarch: noarch
%endif
@@ -148,14 +148,14 @@ http://jakarta.apache.org/struts.
%package manual
Summary: Manual for %{name}
-Group: Development/Documentation
+Group: Documentation
%description manual
Documentation for %{name}.
%package javadoc
Summary: Javadoc for %{name}
-Group: Development/Documentation
+Group: Documentation
# for /bin/rm and /bin/ln
Requires(post): coreutils
Requires(postun): coreutils
@@ -166,20 +166,20 @@ Javadoc for %{name}.
%if ! %{gcj_support}
%package webapps-tomcat3
Summary: Sample %{name} webapps for tomcat3
-Group: Development/Java
+Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: jakarta-commons-beanutils
Requires: jakarta-commons-digester
Requires: jakarta-commons-fileupload
Requires: jakarta-commons-validator
-Requires: oro
+Requires: jakarta-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): jakarta-oro
Requires(post): tomcat3
Requires(pre): tomcat3
# for /bin/ln and /bin/rm
@@ -197,20 +197,20 @@ Sample %{name} webapps for tomcat3.
%package webapps-tomcat4
Summary: Sample %{name} webapps for tomcat4
-Group: Development/Java
+Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: jakarta-commons-beanutils
Requires: jakarta-commons-digester
Requires: jakarta-commons-fileupload
Requires: jakarta-commons-validator
-Requires: oro
+Requires: jakarta-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): jakarta-oro
Requires(post): tomcat4
Requires(pre): tomcat4
# for /bin/ln and /bin/rm
@@ -229,20 +229,20 @@ Sample %{name} webapps for tomcat4.
%package webapps-tomcat5
Summary: Sample %{name} webapps for tomcat5
-Group: Development/Java
+Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: jakarta-commons-beanutils
Requires: jakarta-commons-digester
Requires: jakarta-commons-fileupload
Requires: jakarta-commons-validator
-Requires: oro
+Requires: jakarta-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): jakarta-oro
Requires(post): tomcat5
Requires(pre): tomcat5
# for /bin/ln and /bin/rm
@@ -261,7 +261,7 @@ Sample %{name} webapps for tomcat5.
%if %{without_coreonly}
%package chain
Summary: The %{name} Chain Of Responsibility Adapter
-Group: Development/Java
+Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: jakarta-commons-chain
@@ -276,7 +276,7 @@ Requires(postun): java-gcj-compat
%package chain-javadoc
Summary: Javadoc for %{name}-chain
-Group: Development/Documentation
+Group: Documentation
# for /bin/rm and /bin/ln
Requires(post): coreutils
Requires(postun): coreutils
@@ -286,7 +286,7 @@ Requires(postun): coreutils
%package chain-webapps-tomcat5
Summary: Sample %{name} chain adapter webapps for tomcat5
-Group: Development/Java
+Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: %{name}-chain = %{version}-%{release}
Requires: tomcat5
@@ -311,7 +311,7 @@ Requires(postun): java-gcj-compat
%if %{without_coreonly}
%package el
Summary: The %{name} EL extension
-Group: Development/Java
+Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: jakarta-taglibs-standard
@@ -323,16 +323,16 @@ Requires(postun): java-gcj-compat
%description el
This subproject is an extension of the Struts tag library.
-Each JSP custom tag in this library is a subclass of an
-associated tag in the Struts tag library. One difference is
+Each JSP custom tag in this library is a subclass of an
+associated tag in the Struts tag library. One difference is
that this tag library does not use "rtexprvalues", it uses
-the expression evaluation engine in the Jakarta Taglibs
-implementation of the JSP Standard Tag Library (version 1.0)
+the expression evaluation engine in the Jakarta Taglibs
+implementation of the JSP Standard Tag Library (version 1.0)
to evaluate attribute values.
%package el-javadoc
Summary: Javadoc for %{name}-el
-Group: Development/Documentation
+Group: Documentation
# for /bin/rm and /bin/ln
Requires(post): coreutils
Requires(postun): coreutils
@@ -342,7 +342,7 @@ Requires(postun): coreutils
%package el-webapps-tomcat5
Summary: Sample %{name} EL extension webapps for tomcat5
-Group: Development/Java
+Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: %{name}-el = %{version}-%{release}
Requires: tomcat5
@@ -362,7 +362,7 @@ Requires(preun): coreutils
%if %{without_coreonly}
%package faces
Summary: The %{name}-faces integration library
-Group: Development/Java
+Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: myfaces
@@ -373,19 +373,19 @@ Requires(postun): java-gcj-compat
%endif
%description faces
-This package contains an add-on library that supports the
-use of JavaServer Faces (JSF) user interface technology in a
-Struts based web application, in place of the Struts custom
-tag libraries. As a proof of concept, it also includes the
-canonical "struts-example" example web application, converted
-to use JSF tags, as well as tags from the JSP Standard Tag
+This package contains an add-on library that supports the
+use of JavaServer Faces (JSF) user interface technology in a
+Struts based web application, in place of the Struts custom
+tag libraries. As a proof of concept, it also includes the
+canonical "struts-example" example web application, converted
+to use JSF tags, as well as tags from the JSP Standard Tag
Library (JSTL), version 1.0 or later. It also includes
-a very basic Tiles based application, modified in a similar
+a very basic Tiles based application, modified in a similar
manner.
%package faces-javadoc
Summary: Javadoc for %{name}-faces
-Group: Development/Documentation
+Group: Documentation
# for /bin/rm and /bin/ln
Requires(post): coreutils
Requires(postun): coreutils
@@ -395,7 +395,7 @@ Requires(postun): coreutils
%package faces-webapps-tomcat5
Summary: Sample %{name}-faces integration webapps for tomcat5
-Group: Development/Java
+Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: %{name}-faces = %{version}-%{release}
Requires: jakarta-commons-beanutils
@@ -405,7 +405,7 @@ Requires: jakarta-commons-fileupload
Requires: jakarta-commons-logging
Requires: jakarta-commons-validator
Requires: myfaces
-Requires: oro
+Requires: jakarta-oro
Requires: tomcat5
Requires(post): %{name} = %{version}-%{release}
Requires(post): %{name}-faces = %{version}-%{release}
@@ -416,7 +416,7 @@ Requires(post): jakarta-commons-fileupload
Requires(post): jakarta-commons-logging
Requires(post): jakarta-commons-validator
Requires(post): myfaces
-Requires(post): oro
+Requires(post): jakarta-oro
Requires(post): tomcat5
Requires(pre): tomcat5
# for /bin/rm
@@ -1076,6 +1076,10 @@ fi
%changelog
+* Tue Mar 1 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.2.9-9
+- Change oro dependencies to jakarta-oro
+- Fix groups to be valid
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.2.9-8.12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
@@ -1169,15 +1173,15 @@ fi
* Tue Mar 25 2003 Nicolas Mailhot <Nicolas.Mailhot (at) JPackage.org> 1.0.2-4jpp
- for jpackage-utils 1.5
-* Thu Mar 28 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.0.2-3jpp
+* Thu Mar 28 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.0.2-3jpp
- fixed incorrect files in manual package
-* Wed Mar 27 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.0.2-2jpp
+* Wed Mar 27 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.0.2-2jpp
- corrected URL
- cleaned webapps
- tagged webapps
-* Sun Mar 24 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.0.2-1jpp
+* Sun Mar 24 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.0.2-1jpp
- 1.0.2
- generic servlet support
- distinct webapps for tomcat3 and tomcat4
More information about the scm-commits
mailing list