Accepting request 548123 from Java:packages
OBS-URL: https://build.opensuse.org/request/show/548123 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tomcat?expand=0&rev=40
This commit is contained in:
Git OBS Bridge
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fdfe5fb204dab3b4ca44717600c486ff1271d75658b397713fd942577fcd1c1d
|
||||
size 4970761
|
||||
@@ -1,17 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2
|
||||
|
||||
iQIcBAABCgAGBQJZE02vAAoJECCLCrHWMBHHM3IP/3sJB9MhOQ4ykxyiIimuVT9Z
|
||||
HKXxYIy9hAvljAaCB8H2Fro1Ghhc7wRHrTw6ZWT0doiAAg1KfyETXp03XXwFcNfz
|
||||
peZjL8BIWB4xwm6tQBBzkFs89P2rLz8xyR+EXeY8KabsUmxJNBBgkNnA513b39SP
|
||||
XaHmZ/Gt3+sSDjfgkBfQcwAVooS3bbLZyh/h6B4rPWLc2iWLuIKoQBHFBXb1DjQ0
|
||||
h7+m8IZ1t9voYNRtX2qUgzSY+qXfI8lJNLBTFIccR8mVGqdYmj5fmAb4e0OkOMrH
|
||||
oTYR+IsB86OW0pPE8Wy0EETN9eNLxtFXQ876itBXw1RVKhcK7Mi8dZ/USxwOjWCy
|
||||
CGIrdmaJ4S7vE5LoRsMc9hWMslcZMr6RhpEE5dvJPQw2hfv/vvnatypFnmWpWx+t
|
||||
cUdB5AiiEqfDqbj4o/Kz3rgl+hJZ4Nrx6HclQjE4sUi3lUBgPOrMDD2ZBeTGfT8D
|
||||
yY/VomlzeR5tPUNIx2C+nagtMGQjcKnaIuY/BZvKfQYyl/yJv8a8p0bzN5n6cbXw
|
||||
fQfATLBzZNa+wy5TWpmMhDamzLyZEuftqcO/Y7aMwTjnL36pQUsYoTvsQM5fpe1B
|
||||
XckmxPzBWjgoJ+NDMK3IbDdac33PAB4+JbTZMToN8XvFNFBAFFZCDgCQ+BeipJ5a
|
||||
8FnaXRHNurbFiIChu1L2
|
||||
=S6iN
|
||||
-----END PGP SIGNATURE-----
|
||||
3
apache-tomcat-9.0.2-src.tar.gz
Normal file
3
apache-tomcat-9.0.2-src.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:50e37122a87875b41b79743140ad808feecd55f5787a847dc0fd6083bf4d9598
|
||||
size 5047832
|
||||
7
apache-tomcat-9.0.2-src.tar.gz.asc
Normal file
7
apache-tomcat-9.0.2-src.tar.gz.asc
Normal file
@@ -0,0 +1,7 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2
|
||||
|
||||
iEYEABECAAYFAloZ3J0ACgkQb7IeiTPGAkOHRQCfZKihZnMkrUsWAcNpyYiHMXXG
|
||||
pOIAn0OwbvwlLYkyF5ij1EycuBdjg5zd
|
||||
=C16n
|
||||
-----END PGP SIGNATURE-----
|
||||
@@ -1,42 +0,0 @@
|
||||
--- apache-tomcat-8.0.44-src/build.xml 2017-05-10 19:27:41.000000000 +0200
|
||||
+++ apache-tomcat-8.0.44-src/build.xml 2017-09-19 11:04:39.650918739 +0200
|
||||
@@ -1952,6 +1952,7 @@
|
||||
encoding="UTF-8"
|
||||
docencoding="UTF-8"
|
||||
charset="UTF-8"
|
||||
+ source="${compile.source}"
|
||||
additionalparam="-breakiterator -notimestamp"
|
||||
maxmemory="512m"
|
||||
failonerror="true">
|
||||
@@ -1972,6 +1973,7 @@
|
||||
encoding="UTF-8"
|
||||
docencoding="UTF-8"
|
||||
charset="UTF-8"
|
||||
+ source="${compile.source}"
|
||||
additionalparam="-breakiterator -notimestamp"
|
||||
maxmemory="512m"
|
||||
failonerror="true">
|
||||
@@ -1992,6 +1994,7 @@
|
||||
encoding="UTF-8"
|
||||
docencoding="UTF-8"
|
||||
charset="UTF-8"
|
||||
+ source="${compile.source}"
|
||||
additionalparam="-breakiterator -notimestamp"
|
||||
maxmemory="512m"
|
||||
failonerror="true">
|
||||
@@ -2012,6 +2015,7 @@
|
||||
encoding="UTF-8"
|
||||
docencoding="UTF-8"
|
||||
charset="UTF-8"
|
||||
+ source="${compile.source}"
|
||||
additionalparam="-breakiterator -notimestamp"
|
||||
maxmemory="512m"
|
||||
failonerror="true">
|
||||
@@ -2031,6 +2035,7 @@
|
||||
encoding="UTF-8"
|
||||
docencoding="UTF-8"
|
||||
charset="UTF-8"
|
||||
+ source="${compile.source}"
|
||||
additionalparam="-breakiterator -notimestamp"
|
||||
maxmemory="512m"
|
||||
failonerror="true">
|
||||
@@ -1,27 +0,0 @@
|
||||
Index: apache-tomcat-8.0.32-src/build.properties.default
|
||||
===================================================================
|
||||
--- apache-tomcat-8.0.32-src.orig/build.properties.default
|
||||
+++ apache-tomcat-8.0.32-src/build.properties.default
|
||||
@@ -58,6 +58,9 @@ execute.findbugs=false
|
||||
# multicast tests to work
|
||||
java.net.preferIPv4Stack=false
|
||||
|
||||
+# ----- Build on Windows ----
|
||||
+build.windows=false
|
||||
+
|
||||
# Location of GPG executable (used only for releases)
|
||||
gpg.exec=/path/to/gpg
|
||||
|
||||
Index: apache-tomcat-8.0.32-src/build.xml
|
||||
===================================================================
|
||||
--- apache-tomcat-8.0.32-src.orig/build.xml
|
||||
+++ apache-tomcat-8.0.32-src/build.xml
|
||||
@@ -2844,7 +2844,7 @@ skip.installer property in build.propert
|
||||
</target>
|
||||
|
||||
<target name="download-dist"
|
||||
- description="Download additional components for a distribution" >
|
||||
+ description="Download additional components for a distribution" if="${build.windows}">
|
||||
|
||||
<antcall target="downloadzip-2">
|
||||
<param name="sourcefile.1" value="${tomcat-native.win.1}"/>
|
||||
@@ -1,6 +1,11 @@
|
||||
--- java/org/apache/jasper/compiler/JDTCompiler.java.orig 2016-04-22 11:13:13.194743602 +0200
|
||||
+++ java/org/apache/jasper/compiler/JDTCompiler.java 2016-04-22 11:17:02.457841335 +0200
|
||||
@@ -311,10 +311,10 @@ public class JDTCompiler extends org.apa
|
||||
Index: java/org/apache/jasper/compiler/JDTCompiler.java
|
||||
IDEA additional info:
|
||||
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
||||
<+>UTF-8
|
||||
===================================================================
|
||||
--- java/org/apache/jasper/compiler/JDTCompiler.java (date 1506521372000)
|
||||
+++ java/org/apache/jasper/compiler/JDTCompiler.java (revision )
|
||||
@@ -312,10 +312,10 @@
|
||||
CompilerOptions.VERSION_1_7);
|
||||
} else if(opt.equals("1.8")) {
|
||||
settings.put(CompilerOptions.OPTION_Source,
|
||||
@@ -13,7 +18,7 @@
|
||||
} else {
|
||||
log.warn("Unknown source VM " + opt + " ignored.");
|
||||
settings.put(CompilerOptions.OPTION_Source,
|
||||
@@ -358,14 +358,14 @@ public class JDTCompiler extends org.apa
|
||||
@@ -359,14 +359,14 @@
|
||||
CompilerOptions.VERSION_1_7);
|
||||
} else if(opt.equals("1.8")) {
|
||||
settings.put(CompilerOptions.OPTION_TargetPlatform,
|
||||
72
tomcat-9.0-javadoc.patch
Normal file
72
tomcat-9.0-javadoc.patch
Normal file
@@ -0,0 +1,72 @@
|
||||
Index: build.xml
|
||||
IDEA additional info:
|
||||
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
||||
<+>UTF-8
|
||||
===================================================================
|
||||
--- build.xml (date 1511643656000)
|
||||
+++ build.xml (revision )
|
||||
@@ -1772,10 +1772,11 @@
|
||||
encoding="UTF-8"
|
||||
docencoding="UTF-8"
|
||||
charset="UTF-8"
|
||||
+ source="${compile.source}"
|
||||
additionalparam="-breakiterator -notimestamp"
|
||||
maxmemory="512m"
|
||||
failonerror="true"
|
||||
- failonwarning="true">
|
||||
+ failonwarning="false">
|
||||
<classpath>
|
||||
<path refid="compile.classpath"/>
|
||||
<path refid="tomcat.webservices.classpath"/>
|
||||
@@ -1793,10 +1794,11 @@
|
||||
encoding="UTF-8"
|
||||
docencoding="UTF-8"
|
||||
charset="UTF-8"
|
||||
+ source="${compile.source}"
|
||||
additionalparam="-breakiterator -notimestamp"
|
||||
maxmemory="512m"
|
||||
failonerror="true"
|
||||
- failonwarning="true">
|
||||
+ failonwarning="false">
|
||||
<classpath>
|
||||
<path refid="compile.classpath"/>
|
||||
<path refid="tomcat.webservices.classpath"/>
|
||||
@@ -1814,10 +1816,11 @@
|
||||
encoding="UTF-8"
|
||||
docencoding="UTF-8"
|
||||
charset="UTF-8"
|
||||
+ source="${compile.source}"
|
||||
additionalparam="-breakiterator -notimestamp"
|
||||
maxmemory="512m"
|
||||
failonerror="true"
|
||||
- failonwarning="true">
|
||||
+ failonwarning="false">
|
||||
<classpath>
|
||||
<path refid="compile.classpath"/>
|
||||
<path refid="tomcat.webservices.classpath"/>
|
||||
@@ -1835,10 +1838,11 @@
|
||||
encoding="UTF-8"
|
||||
docencoding="UTF-8"
|
||||
charset="UTF-8"
|
||||
+ source="${compile.source}"
|
||||
additionalparam="-breakiterator -notimestamp"
|
||||
maxmemory="512m"
|
||||
failonerror="true"
|
||||
- failonwarning="true">
|
||||
+ failonwarning="false">
|
||||
<classpath>
|
||||
<path refid="compile.classpath"/>
|
||||
<path refid="tomcat.webservices.classpath"/>
|
||||
@@ -1855,10 +1859,11 @@
|
||||
encoding="UTF-8"
|
||||
docencoding="UTF-8"
|
||||
charset="UTF-8"
|
||||
+ source="${compile.source}"
|
||||
additionalparam="-breakiterator -notimestamp ${java9.add.modules}"
|
||||
maxmemory="512m"
|
||||
failonerror="true"
|
||||
- failonwarning="true">
|
||||
+ failonwarning="false">
|
||||
<classpath>
|
||||
<path refid="compile.classpath"/>
|
||||
<path refid="tomcat.webservices.classpath"/>
|
||||
@@ -5,22 +5,6 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
||||
===================================================================
|
||||
--- conf/catalina.policy (revision Local version)
|
||||
+++ conf/catalina.policy (revision Shelved version)
|
||||
@@ -100,6 +100,7 @@
|
||||
// ${file.separator}classes${file.separator}logging.properties", "read";
|
||||
};
|
||||
|
||||
+
|
||||
// These permissions apply to the server startup code
|
||||
grant codeBase "file:${catalina.home}/bin/bootstrap.jar" {
|
||||
permission java.security.AllPermission;
|
||||
@@ -112,7 +113,6 @@
|
||||
permission java.security.AllPermission;
|
||||
};
|
||||
|
||||
-
|
||||
// If using a per instance lib directory, i.e. ${catalina.base}/lib,
|
||||
// then the following permission will need to be uncommented
|
||||
// grant codeBase "file:${catalina.base}/lib/-" {
|
||||
@@ -167,6 +167,9 @@
|
||||
permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat";
|
||||
|
||||
@@ -31,10 +15,10 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
||||
permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.el";
|
||||
permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime";
|
||||
permission java.lang.RuntimePermission
|
||||
@@ -216,6 +219,15 @@
|
||||
permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.util";
|
||||
@@ -230,6 +233,15 @@
|
||||
};
|
||||
|
||||
|
||||
+// Additional basic permissions for web applications.
|
||||
+grant codeBase "file:/usr/share/java/tomcat-servlet-api.jar" {
|
||||
+ permission java.security.AllPermission;
|
||||
@@ -47,11 +31,3 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
||||
// You can assign additional permissions to particular web applications by
|
||||
// adding additional "grant" entries here, based on the code base for that
|
||||
// application, /WEB-INF/classes/, or /WEB-INF/lib/ jar files.
|
||||
@@ -247,7 +259,6 @@
|
||||
// grant codeBase "jar:file:${catalina.base}/webapps/examples/WEB-INF/lib/scrape.jar!/-" {
|
||||
// permission java.net.SocketPermission "*.noaa.gov:80", "connect";
|
||||
// };
|
||||
-
|
||||
// To grant permissions for web applications using packed WAR files, use the
|
||||
// Tomcat specific WAR url scheme.
|
||||
//
|
||||
@@ -20,7 +20,7 @@ TOMCAT_CFG_LOADED="1"
|
||||
TOMCATS_BASE="/var/lib/tomcats/"
|
||||
|
||||
# Where your java installation lives
|
||||
JAVA_HOME="/usr/lib/jvm/jre"
|
||||
#JAVA_HOME="/usr/libi64/jvm/jre"
|
||||
|
||||
# Where your tomcat installation lives
|
||||
CATALINA_HOME="@@@TCHOME@@@"
|
||||
@@ -1,3 +1,55 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 1 21:46:18 UTC 2017 - malbu@suse.com
|
||||
|
||||
- Update to Tomcat 9.0.2:
|
||||
* Major update for tomcat8 from tomcat9
|
||||
* For full changelog please read upstream changes at:
|
||||
+ http://tomcat.apache.org/tomcat-9.0-doc/changelog.html
|
||||
* Rename all tomcat-8.0-* files to tomcat-9.0-*
|
||||
- Changed patches:
|
||||
* Deleted: tomcat-8.0-bootstrap-MANIFEST.MF.patch
|
||||
* Deleted: tomcat-8.0-sle.catalina.policy.patch
|
||||
* Deleted: tomcat-8.0-tomcat-users-webapp.patch
|
||||
* Deleted: tomcat-8.0.33-JDTCompiler-java.patch
|
||||
* Deleted: tomcat-8.0.44-javadoc.patch
|
||||
* Deleted: tomcat-8.0.9-property-build.windows.patch
|
||||
* Added: tomcat-9.0-JDTCompiler-java.patch
|
||||
* Added: tomcat-9.0-bootstrap-MANIFEST.MF.patch
|
||||
* Added: tomcat-9.0-javadoc.patch
|
||||
* Added: tomcat-9.0-sle.catalina.policy.patch
|
||||
* Added: tomcat-9.0-tomcat-users-webapp.patch
|
||||
- Renamed subpackage tomcat-3_1-api to tomcat-4_0-api
|
||||
to reflect the new Servlet API version.
|
||||
- Commented out JAVA_HOME in /etc/tomcat/tomcat.conf
|
||||
- Added "tomcat-" prefix to lib symlinks under
|
||||
/usr/share/java to avoid file conflicts with servletapi5
|
||||
and geronimo-specs
|
||||
- Fixed wrong %ghost file paths for alternatives symlinks
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 23 13:50:29 UTC 2017 - rbrown@suse.com
|
||||
|
||||
- Replace references to /var/adm/fillup-templates with new
|
||||
%_fillupdir macro (boo#1069468)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 23 09:42:48 UTC 2017 - malbu@suse.com
|
||||
|
||||
- Build with JDK 8 to fix runtime errors when running with JDK 7
|
||||
and 8
|
||||
- Fix tomcat-digest classpath error (bsc#977410)
|
||||
- Fix packaged /etc/alternatives symlinks for api libs that caused
|
||||
rpm -V to report link mismatch (bsc#1019016)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 23 06:07:05 UTC 2017 - ecsos@opensuse.org
|
||||
|
||||
- update to 8.0.47
|
||||
http://tomcat.apache.org/tomcat-8.0-doc/changelog.html
|
||||
* Fixed CVE:
|
||||
- CVE-2017-12617
|
||||
- rebase tomcat-8.0-sle.catalina.policy.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 19 09:07:39 UTC 2017 - fstrba@suse.com
|
||||
|
||||
|
||||
91
tomcat.spec
91
tomcat.spec
@@ -17,12 +17,17 @@
|
||||
#
|
||||
|
||||
|
||||
#Compat macro for new _fillupdir macro introduced in Nov 2017
|
||||
%if ! %{defined _fillupdir}
|
||||
%define _fillupdir /var/adm/fillup-templates
|
||||
%endif
|
||||
|
||||
%define jspspec 2.3
|
||||
%define servletspec 3.1
|
||||
%define servletspec 4.0
|
||||
%define elspec 3.0
|
||||
%define major_version 8
|
||||
%define major_version 9
|
||||
%define minor_version 0
|
||||
%define micro_version 44
|
||||
%define micro_version 2
|
||||
%define packdname apache-tomcat-%{version}-src
|
||||
# FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/
|
||||
%global basedir /srv/%{name}
|
||||
@@ -38,7 +43,7 @@
|
||||
Name: tomcat
|
||||
Version: %{major_version}.%{minor_version}.%{micro_version}
|
||||
Release: 0
|
||||
Summary: Apache Servlet/JSP/EL Engine, RI for Servlet 3.1/JSP 2.3/EL 3.0 API
|
||||
Summary: Apache Servlet/JSP/EL Engine, RI for Servlet 4.0/JSP 2.3/EL 3.0 API
|
||||
License: Apache-2.0
|
||||
Group: Productivity/Networking/Web/Servers
|
||||
Url: http://tomcat.apache.org
|
||||
@@ -72,13 +77,13 @@ Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.
|
||||
#PATCH-FIX-UPSTREAM: from jpackage.org package
|
||||
Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
|
||||
#PATCH-FIX-OPENSUSE: skip few windows specific parts of build
|
||||
Patch2: tomcat-8.0.9-property-build.windows.patch
|
||||
#Patch2: %{name}-%{major_version}.%{minor_version}-property-build.windows.patch
|
||||
# PATCH-FIX-UPSTREAM: https://issues.apache.org/bugzilla/show_bug.cgi?id=56373
|
||||
Patch3: tomcat-8.0.33-JDTCompiler-java.patch
|
||||
# PATCH-FIX-SLE: Change security manager default policies bnc#891264
|
||||
Patch4: tomcat-8.0-sle.catalina.policy.patch
|
||||
Patch2: %{name}-%{major_version}.%{minor_version}-JDTCompiler-java.patch
|
||||
# PATCH-FIX-SLE: Change security manager default policies bnc#891264
|
||||
Patch3: %{name}-%{major_version}.%{minor_version}-sle.catalina.policy.patch
|
||||
# PATCH-FIX-OPENSUSE: build javadoc with the same java source level as the class files
|
||||
Patch5: tomcat-8.0.44-javadoc.patch
|
||||
Patch4: %{name}-%{major_version}.%{minor_version}-javadoc.patch
|
||||
BuildRequires: ant >= 1.8.1
|
||||
BuildRequires: ant-antlr
|
||||
BuildRequires: apache-commons-collections
|
||||
@@ -93,7 +98,7 @@ BuildRequires: geronimo-jaxrpc-1_1-api
|
||||
BuildRequires: geronimo-qname-1_1-api
|
||||
BuildRequires: geronimo-saaj-1_1-api
|
||||
BuildRequires: jakarta-taglibs-standard >= 1.1
|
||||
BuildRequires: java-devel >= 1.7.0
|
||||
BuildRequires: java-devel = 1.8.0
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: javapackages-tools
|
||||
BuildRequires: junit
|
||||
@@ -213,7 +218,7 @@ Obsoletes: jakarta-commons-dbcp-tomcat5 < 1.4
|
||||
%description lib
|
||||
Libraries required to successfully run the Tomcat Web container
|
||||
|
||||
%package servlet-3_1-api
|
||||
%package servlet-4_0-api
|
||||
Summary: Apache Tomcat Servlet API implementation classes
|
||||
Group: Productivity/Networking/Web/Servers
|
||||
Requires(post): update-alternatives
|
||||
@@ -224,8 +229,9 @@ Provides: servlet31
|
||||
Provides: servlet7
|
||||
Obsoletes: servlet < %{servletspec}
|
||||
Obsoletes: tomcat-servlet-3_0-api
|
||||
Obsoletes: tomcat-servlet-3_1-api
|
||||
|
||||
%description servlet-3_1-api
|
||||
%description servlet-4_0-api
|
||||
Apache Tomcat Servlet API implementation classes version 3.1
|
||||
|
||||
%package webapps
|
||||
@@ -244,10 +250,9 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
|
||||
-name "*.jar" -o -name "*.war" -o -name "*.zip" \) | xargs -t rm -f
|
||||
%patch0
|
||||
%patch1
|
||||
%patch2 -p1
|
||||
%patch2
|
||||
%patch3
|
||||
%patch4
|
||||
%patch5 -p1
|
||||
|
||||
# remove date from docs
|
||||
sed -i -e '/build-date/ d' webapps/docs/tomcat-docs.xsl
|
||||
@@ -354,7 +359,7 @@ install -d -m 0775 %{buildroot}%{tempdir}
|
||||
install -d -m 0775 %{buildroot}%{workdir}
|
||||
install -d -m 0755 %{buildroot}%{_unitdir}
|
||||
install -d -m 0755 %{buildroot}%{_libexecdir}/%{name}
|
||||
install -d -m 0755 %{buildroot}%{_localstatedir}/adm/fillup-templates
|
||||
install -d -m 0755 %{buildroot}%{_fillupdir}
|
||||
|
||||
# move things into place
|
||||
# First copy supporting libs to tomcat lib
|
||||
@@ -385,7 +390,7 @@ sed -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
|
||||
sed -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
|
||||
-e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
|
||||
-e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE3} \
|
||||
> %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
|
||||
> %{buildroot}%{_fillupdir}/sysconfig.%{name}
|
||||
install -m 0644 %{SOURCE4} \
|
||||
%{buildroot}%{_sbindir}/%{name}
|
||||
install -m 0644 %{SOURCE11} \
|
||||
@@ -540,10 +545,6 @@ cp -a tomcat-embed-el.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-embed-e
|
||||
cp -a tomcat-embed-jasper.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-embed-jasper.pom
|
||||
%add_maven_depmap JPP.%{name}-tomcat-embed-jasper.pom %{name}/tomcat-embed-jasper.jar
|
||||
|
||||
cp -a tomcat-embed-logging-juli.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-embed-logging-juli.pom
|
||||
%add_maven_depmap JPP.%{name}-tomcat-embed-logging-juli.pom %{name}/tomcat-embed-logging-juli.jar
|
||||
|
||||
cp -a tomcat-websocket-api.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-websocket-api.pom
|
||||
%add_maven_depmap JPP.%{name}-websocket-api.pom %{name}/websocket-api.jar
|
||||
|
||||
cp -a tomcat-embed-websocket.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-embed-websocket.pom
|
||||
@@ -564,16 +565,12 @@ echo "%{name}/catalina-ant" > %{buildroot}/%{_sysconfdir}/ant.d/catalina-ant
|
||||
#bnc#565901
|
||||
ln -sf %{_sbindir}/%{name} %{buildroot}/%{bindir}/catalina.sh
|
||||
|
||||
# Install update-alternatives content
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
|
||||
touch %{buildroot}%{_sysconfdir}/alternatives/el_api.jar
|
||||
ln -sf %{_sysconfdir}/alternatives/el_api.jar %{buildroot}%{_javadir}/el_api.jar
|
||||
touch %{buildroot}%{_sysconfdir}/alternatives/el_1_0_api.jar
|
||||
ln -sf %{_sysconfdir}/alternatives/el_1_0_api.jar %{buildroot}%{_javadir}/el_1_0_api.jar
|
||||
touch %{buildroot}%{_sysconfdir}/alternatives/jsp.jar
|
||||
ln -sf %{_sysconfdir}/alternatives/jsp.jar %{buildroot}%{_javadir}/jsp.jar
|
||||
touch %{buildroot}%{_sysconfdir}/alternatives/servlet.jar
|
||||
ln -sf %{_sysconfdir}/alternatives/servlet.jar %{buildroot}%{_javadir}/servlet.jar
|
||||
# Install update-alternatives content
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
|
||||
ln -s -f %{_sysconfdir}/alternatives/el_api %{buildroot}%{_javadir}/%{name}-el_api.jar
|
||||
ln -s -f %{_sysconfdir}/alternatives/el_1_0_api %{buildroot}%{_javadir}/%{name}-el_1_0_api.jar
|
||||
ln -s -f %{_sysconfdir}/alternatives/jsp %{buildroot}%{_javadir}/%{name}-jsp.jar
|
||||
ln -s -f %{_sysconfdir}/alternatives/servlet %{buildroot}%{_javadir}/%{name}-servlet.jar
|
||||
|
||||
mkdir -p %{buildroot}%{_tmpfilesdir}
|
||||
cat > %{buildroot}%{_tmpfilesdir}/%{name}.conf <<EOF
|
||||
@@ -611,8 +608,8 @@ EOF
|
||||
%service_del_postun %{name}-jsvc.service
|
||||
|
||||
%post el-3_0-api
|
||||
update-alternatives --install %{_javadir}/el_api.jar el_api %{_javadir}/%{name}-el-%{elspec}-api.jar 20300
|
||||
update-alternatives --install %{_javadir}/el_1_0_api.jar el_1_0_api %{_javadir}/%{name}-el-%{elspec}-api.jar 20300
|
||||
update-alternatives --install %{_javadir}/%{name}-el_api.jar el_api %{_javadir}/%{name}-el-%{elspec}-api.jar 20300
|
||||
update-alternatives --install %{_javadir}/%{name}-el_1_0_api.jar el_1_0_api %{_javadir}/%{name}-el-%{elspec}-api.jar 20300
|
||||
|
||||
%preun el-3_0-api
|
||||
if [ $1 -eq 0 ] ; then
|
||||
@@ -621,7 +618,7 @@ if [ $1 -eq 0 ] ; then
|
||||
fi
|
||||
|
||||
%post jsp-2_3-api
|
||||
update-alternatives --install %{_javadir}/jsp.jar jsp \
|
||||
update-alternatives --install %{_javadir}/%{name}-jsp.jar jsp \
|
||||
%{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20200
|
||||
|
||||
%postun jsp-2_3-api
|
||||
@@ -630,11 +627,11 @@ if [ $1 -eq 0 ] ; then
|
||||
%{_javadir}/%{name}-jsp-%{jspspec}-api.jar
|
||||
fi
|
||||
|
||||
%post servlet-3_1-api
|
||||
update-alternatives --install %{_javadir}/servlet.jar servlet \
|
||||
%post servlet-4_0-api
|
||||
update-alternatives --install %{_javadir}/%{name}-servlet.jar servlet \
|
||||
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar 30000
|
||||
|
||||
%postun servlet-3_1-api
|
||||
%postun servlet-4_0-api
|
||||
if [ $1 -eq 0 ] ; then
|
||||
update-alternatives --remove servlet \
|
||||
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar
|
||||
@@ -687,6 +684,7 @@ rm -f \
|
||||
%attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/server.xml
|
||||
%attr(0660,tomcat,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml
|
||||
%attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/web.xml
|
||||
%attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/jaspic-providers.xml
|
||||
%dir %{homedir}
|
||||
%{_tmpfilesdir}/%{name}.conf
|
||||
%{bindir}/bootstrap.jar
|
||||
@@ -697,7 +695,7 @@ rm -f \
|
||||
%{homedir}/work
|
||||
%{homedir}/logs
|
||||
%{homedir}/conf
|
||||
%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
|
||||
%{_fillupdir}/sysconfig.%{name}
|
||||
|
||||
%files admin-webapps
|
||||
%{appdir}/host-manager
|
||||
@@ -716,10 +714,10 @@ rm -f \
|
||||
%else
|
||||
%{_datadir}/maven-metadata/%{name}-tomcat-el-api.xml
|
||||
%endif
|
||||
%{_javadir}/el_1_0_api.jar
|
||||
%{_javadir}/el_api.jar
|
||||
%ghost %{_sysconfdir}/alternatives/el_1_0_api.jar
|
||||
%ghost %{_sysconfdir}/alternatives/el_api.jar
|
||||
%{_javadir}/%{name}-el_1_0_api.jar
|
||||
%{_javadir}/%{name}-el_api.jar
|
||||
%ghost %{_sysconfdir}/alternatives/el_1_0_api
|
||||
%ghost %{_sysconfdir}/alternatives/el_api
|
||||
|
||||
%files javadoc
|
||||
%doc %{_javadocdir}/%{name}
|
||||
@@ -727,8 +725,8 @@ rm -f \
|
||||
%files jsp-2_3-api
|
||||
%{_javadir}/%{name}-jsp-%{jspspec}-api.jar
|
||||
%{_javadir}/%{name}-jsp-api.jar
|
||||
%{_javadir}/jsp.jar
|
||||
%ghost %{_sysconfdir}/alternatives/jsp.jar
|
||||
%{_javadir}/%{name}-jsp.jar
|
||||
%ghost %{_sysconfdir}/alternatives/jsp
|
||||
%{_mavenpomdir}/JPP-%{name}-jsp-api.pom
|
||||
%if %{defined _maven_repository}
|
||||
%{_mavendepmapfragdir}/%{name}-tomcat-jsp-api
|
||||
@@ -770,14 +768,13 @@ rm -f \
|
||||
%{_mavenpomdir}/JPP.%{name}-tomcat-embed-core.pom
|
||||
%{_mavenpomdir}/JPP.%{name}-tomcat-embed-el.pom
|
||||
%{_mavenpomdir}/JPP.%{name}-tomcat-embed-jasper.pom
|
||||
%{_mavenpomdir}/JPP.%{name}-tomcat-embed-logging-juli.pom
|
||||
|
||||
%files servlet-3_1-api
|
||||
%files servlet-4_0-api
|
||||
%doc LICENSE
|
||||
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar
|
||||
%{_javadir}/%{name}-servlet-api.jar
|
||||
%{_javadir}/servlet.jar
|
||||
%ghost %{_sysconfdir}/alternatives/servlet.jar
|
||||
%{_javadir}/%{name}-servlet.jar
|
||||
%ghost %{_sysconfdir}/alternatives/servlet
|
||||
%if %{defined _maven_repository}
|
||||
%{_mavendepmapfragdir}/%{name}-tomcat-servlet-api
|
||||
%else
|
||||
|
||||
Reference in New Issue
Block a user