Accepting request 671990 from home:jengelh:branches:Java:packages

use a single %setup
and solve grammar violations

OBS-URL: https://build.opensuse.org/request/show/671990
OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=157
This commit is contained in:
Fridrich Strba 2019-02-24 23:01:00 +00:00 committed by Git OBS Bridge
parent 8be94dcc73
commit 2ca43c3758

View File

@ -13,7 +13,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
@ -140,25 +140,25 @@ released under the Apache Software License version 2.0. Tomcat is
intended to be a collaboration of the best-of-breed developers from intended to be a collaboration of the best-of-breed developers from
around the world. around the world.
ATTENTION-> This tomcat is build with java 1.8.0 ATTENTION: This tomcat is built with java 1.8.0.
%package admin-webapps %package admin-webapps
Summary: The host-manager and manager web applications for Apache Tomcat Summary: The host manager and manager web applications for Apache Tomcat
Group: Productivity/Networking/Web/Servers Group: Productivity/Networking/Web/Servers
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
%description admin-webapps %description admin-webapps
The host-manager and manager web based applications for Apache Tomcat. The host manager and manager web-based applications for Apache Tomcat.
%package embed %package embed
Summary: Libraries for Embedding Apache Tomcat Summary: Libraries for Embedding Apache Tomcat
Group: Productivity/Networking/Web/Servers Group: Productivity/Networking/Web/Servers
%description embed %description embed
Embedded support (various Libraries) for Apache Tomcat Embeddeding support (various libraries) for Apache Tomcat.
%package docs-webapp %package docs-webapp
Summary: The docs web application for Apache Tomcat Summary: The "docs" web application for Apache Tomcat
Group: Productivity/Networking/Web/Servers Group: Productivity/Networking/Web/Servers
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
@ -181,7 +181,7 @@ Expression Language API version 3.0.
%package javadoc %package javadoc
Summary: Javadoc generated documentation for Apache Tomcat Summary: Javadoc generated documentation for Apache Tomcat
Group: Productivity/Networking/Web/Servers Group: Documentation/HTML
%description javadoc %description javadoc
Javadoc generated documentation files for Apache Tomcat. Javadoc generated documentation files for Apache Tomcat.
@ -253,12 +253,11 @@ Requires: jakarta-taglibs-standard >= 1.1
The ROOT and examples web applications for Apache Tomcat The ROOT and examples web applications for Apache Tomcat
%prep %prep
%setup -q -n %{packdname} %setup -q -n %{packdname} -b33
%setup -q -D -T -n %{packdname} -b 33
# remove pre-built binaries and windows files # remove pre-built binaries and windows files
find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "*.gz" -o \ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "*.gz" -o \
-name "*.jar" -o -name "*.war" -o -name "*.zip" \) | xargs -t rm -f -name "*.jar" -o -name "*.war" -o -name "*.zip" \) -print -delete
%patch0 %patch0
%patch1 %patch1
%patch2 %patch2