/[packages]/updates/2/tomcat/current/SPECS/tomcat.spec
ViewVC logotype

Diff of /updates/2/tomcat/current/SPECS/tomcat.spec

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 338836 by schedbot, Sun May 27 17:50:45 2012 UTC revision 338837 by dmorgan, Fri Jan 4 23:34:49 2013 UTC
# Line 31  Line 31 
31  %global jspspec 2.2  %global jspspec 2.2
32  %global major_version 7  %global major_version 7
33  %global minor_version 0  %global minor_version 0
34  %global micro_version 23  %global micro_version 32
35  %global packdname apache-tomcat-%{version}-src  %global packdname apache-tomcat-%{version}-src
36  %global servletspec 3.0  %global servletspec 3.0
37  %global elspec 2.2  %global elspec 2.2
# Line 54  Line 54 
54  Name:          tomcat  Name:          tomcat
55  Epoch:         0  Epoch:         0
56  Version:       %{major_version}.%{minor_version}.%{micro_version}  Version:       %{major_version}.%{minor_version}.%{micro_version}
57  Release:       %mkrel 4  Release:       %mkrel 3
58  Summary:       Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API  Summary:       Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
59    
60  Group:         Development/Java  Group:         Development/Java
# Line 78  Source14:      jasper-OSGi-MANIFEST.MF Line 78  Source14:      jasper-OSGi-MANIFEST.MF
78  Source15:      tomcat-api-OSGi-MANIFEST.MF  Source15:      tomcat-api-OSGi-MANIFEST.MF
79  Source16:      tomcat-juli-OSGi-MANIFEST.MF  Source16:      tomcat-juli-OSGi-MANIFEST.MF
80  Source17:      %{name}-%{major_version}.%{minor_version}-tomcat-sysd  Source17:      %{name}-%{major_version}.%{minor_version}-tomcat-sysd
81    Source18:      %{name}-%{major_version}.%{minor_version}-tomcat-jsvc-sysd
82    Source19:      %{name}-%{major_version}.%{minor_version}-jsvc.wrapper
83    Source20:      %{name}-%{major_version}.%{minor_version}-jsvc.service
84    
85    
86  Patch0:        %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch  Patch0:        %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch
87  Patch1:        %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch  Patch1:        %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
88    
# Line 92  BuildRequires: apache-commons-daemon Line 97  BuildRequires: apache-commons-daemon
97  BuildRequires: apache-commons-dbcp  BuildRequires: apache-commons-dbcp
98  BuildRequires: apache-commons-pool  BuildRequires: apache-commons-pool
99  BuildRequires: jakarta-taglibs-standard  BuildRequires: jakarta-taglibs-standard
100  BuildRequires: java-devel = 0:1.6.0  BuildRequires: java-devel >= 0:1.6.0
101  BuildRequires: jpackage-utils >= 0:1.7.0  BuildRequires: jpackage-utils >= 0:1.7.0
102  BuildRequires: junit  BuildRequires: junit
103  BuildRequires: log4j  BuildRequires: log4j
104  BuildRequires: geronimo-jaxrpc  BuildRequires: geronimo-jaxrpc
105  BuildRequires: wsdl4j  BuildRequires: wsdl4j
 BuildRequires: zip  
106  BuildRequires: systemd-units  BuildRequires: systemd-units
107    BuildRequires: zip
108  Requires:      apache-commons-daemon  Requires:      apache-commons-daemon
109  Requires:      apache-commons-logging  Requires:      apache-commons-logging
110  Requires:      apache-commons-collections  Requires:      apache-commons-collections
111  Requires:      apache-commons-dbcp  Requires:      apache-commons-dbcp
112  Requires:      apache-commons-pool  Requires:      apache-commons-pool
113  Requires:      java = 0:1.6.0  Requires:      java >= 0:1.6.0
114  Requires:      procps  Requires:      procps
115  Requires:      %{name}-lib = %{epoch}:%{version}-%{release}  Requires:      %{name}-lib = %{epoch}:%{version}-%{release}
 Requires(post):  rpm-helper >= 0.24.8-1  
 Requires(preun): rpm-helper >= 0.24.8-1  
116  Requires(pre):    shadow-utils  Requires(pre):    shadow-utils
117  Requires(post):   chkconfig  Requires(post):   chkconfig
118  Requires(preun):  chkconfig  Requires(preun):  chkconfig
# Line 128  released under the Apache Software Licen Line 131  released under the Apache Software Licen
131  to be a collaboration of the best-of-breed developers from around the world.  to be a collaboration of the best-of-breed developers from around the world.
132    
133  %package admin-webapps  %package admin-webapps
134  Group: Development/Java  Group: Development/Java
135  Summary: The host-manager and manager web applications for Apache Tomcat  Summary: The host-manager and manager web applications for Apache Tomcat
136  Requires: %{name} = %{epoch}:%{version}-%{release}  Requires: %{name} = %{epoch}:%{version}-%{release}
137    
# Line 144  Requires: %{name} = %{epoch}:%{version}- Line 147  Requires: %{name} = %{epoch}:%{version}-
147  The docs web application for Apache Tomcat.  The docs web application for Apache Tomcat.
148    
149  %package javadoc  %package javadoc
150  Group: Development/Java  Group:  Development/Java
151  Summary: Javadoc generated documentation for Apache Tomcat  Summary: Javadoc generated documentation for Apache Tomcat
152  Requires: jpackage-utils  Requires: jpackage-utils
153    
154  %description javadoc  %description javadoc
155  Javadoc generated documentation for Apache Tomcat.  Javadoc generated documentation for Apache Tomcat.
156    
157  %package systemv  %package systemv
158  Group:   Development/Java  Group:  Development/Java
159  Summary: Systemv scripts for Apache Tomcat  Summary: Systemv scripts for Apache Tomcat
160  Requires: %{name} = %{epoch}:%{version}-%{release}  Requires: %{name} = %{epoch}:%{version}-%{release}
161    Requires(post): chkconfig
162    Requires(postun): chkconfig
163    
164  %description systemv  %description systemv
165  SystemV scripts to start and stop tomcat service  SystemV scripts to start and stop tomcat service
166    
167    %package jsvc
168    Group: Development/Java
169    Summary: Apache jsvc wrapper for Apache Tomcat as separate service
170    Requires: %{name} = %{epoch}:%{version}-%{release}
171    Requires: apache-commons-daemon-jsvc
172    
173    %description jsvc
174    Systemd service and wrapper scripts to start tomcat with jsvc,
175    which allows tomcat to perform some privileged operations
176    (e.g. bind to a port < 1024) and then switch identity to a non-privileged user.
177    
178  %package jsp-%{jspspec}-api  %package jsp-%{jspspec}-api
179  Group: Development/Java  Group: Development/Java
180  Summary: Apache Tomcat JSP API implementation classes  Summary: Apache Tomcat JSP API implementation classes
181  Provides: jsp = %{jspspec}  Provides: jsp = %{jspspec}
182  Provides: jsp22  Provides: jsp22
183  Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}  Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
 Requires(post): chkconfig  
 Requires(postun): chkconfig  
184    
185  %description jsp-%{jspspec}-api  %description jsp-%{jspspec}-api
186  Apache Tomcat JSP API implementation classes.  Apache Tomcat JSP API implementation classes.
187    
188    
189  %package lib  %package lib
190  Group: Development/Java  Group:    Development/Java
191  Summary: Libraries needed to run the Tomcat Web container  Summary: Libraries needed to run the Tomcat Web container
192  Requires: %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release}  Requires: %{name}-jsp-%{jspspec}-api = %{epoch}:%{version}-%{release}
193  Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}  Requires: %{name}-servlet-%{servletspec}-api = %{epoch}:%{version}-%{release}
# Line 188  Requires(preun): coreutils Line 202  Requires(preun): coreutils
202  Libraries needed to run the Tomcat Web container.  Libraries needed to run the Tomcat Web container.
203    
204  %package servlet-%{servletspec}-api  %package servlet-%{servletspec}-api
205  Group: Development/Java  Group:   Development/Java
206  Summary: Apache Tomcat Servlet API implementation classes  Summary: Apache Tomcat Servlet API implementation classes
207  Provides: servlet = %{servletspec}  Provides: servlet = %{servletspec}
208  Provides: servlet6  Provides: servlet6
209  Provides: servlet3  Provides: servlet3
 Requires(post): chkconfig  
 Requires(postun): chkconfig  
210    
211  %description servlet-%{servletspec}-api  %description servlet-%{servletspec}-api
212  Apache Tomcat Servlet API implementation classes.  Apache Tomcat Servlet API implementation classes.
213    
214  %package el-%{elspec}-api  %package el-%{elspec}-api
215  Group: Development/Java  Group:   Development/Java
216  Summary: Expression Language v1.0 API  Summary: Expression Language v1.0 API
217  Provides: el_1_0_api = %{epoch}:%{version}-%{release}  Provides: el_1_0_api = %{epoch}:%{version}-%{release}
218  Provides: el_api = %{elspec}  Provides: el_api = %{elspec}
 Requires(post): chkconfig  
 Requires(postun): chkconfig  
219    
220  %description el-%{elspec}-api  %description el-%{elspec}-api
221  Expression Language 1.0.  Expression Language 1.0.
222    
223  %package webapps  %package webapps
224  Group: Development/Java  Group:  Development/Java
225  Summary: The ROOT and examples web applications for Apache Tomcat  Summary: The ROOT and examples web applications for Apache Tomcat
226  Requires: %{name} = %{epoch}:%{version}-%{release}  Requires: %{name} = %{epoch}:%{version}-%{release}
227  Requires: jakarta-taglibs-standard >= 0:1.1  Requires: jakarta-taglibs-standard >= 0:1.1
# Line 227  find . -type f \( -name "*.bat" -o -name Line 237  find . -type f \( -name "*.bat" -o -name
237    
238  %patch0 -p0  %patch0 -p0
239  %patch1 -p0  %patch1 -p0
 # %patch2 -p0  
240  %{__ln_s} $(build-classpath jakarta-taglibs-core) webapps/examples/WEB-INF/lib/jstl.jar  %{__ln_s} $(build-classpath jakarta-taglibs-core) webapps/examples/WEB-INF/lib/jstl.jar
241  %{__ln_s} $(build-classpath jakarta-taglibs-standard) webapps/examples/WEB-INF/lib/standard.jar  %{__ln_s} $(build-classpath jakarta-taglibs-standard) webapps/examples/WEB-INF/lib/standard.jar
242    
# Line 249  export OPT_JAR_LIST="xalan-j2-serializer Line 258  export OPT_JAR_LIST="xalan-j2-serializer
258        -Djdt.jar="$(build-classpath ecj)" \        -Djdt.jar="$(build-classpath ecj)" \
259        -Dtomcat-dbcp.jar="$(build-classpath apache-commons-dbcp)" \        -Dtomcat-dbcp.jar="$(build-classpath apache-commons-dbcp)" \
260        -Dtomcat-native.tar.gz="HACK" \        -Dtomcat-native.tar.gz="HACK" \
261        -Dtomcat-native.dll.win32="HACK" \        -Dtomcat-native.home="." \
       -Dtomcat-native.dll.x64="HACK" \  
       -Dtomcat-native.dll.i64="HACK" \  
262        -Dcommons-daemon.native.win.mgr.exe="HACK" \        -Dcommons-daemon.native.win.mgr.exe="HACK" \
263        -Dnsis.exe="HACK" \        -Dnsis.exe="HACK" \
264        -Djaxrpc-lib.jar="$(build-classpath jaxrpc)" \        -Djaxrpc-lib.jar="$(build-classpath jaxrpc)" \
# Line 276  pushd ../web Line 283  pushd ../web
283  popd  popd
284  popd  popd
285    
286    # Allow linking for example webapp
287    %{__mkdir_p} ${RPM_BUILD_ROOT}%{appdir}/examples/META-INF
288    pushd ${RPM_BUILD_ROOT}%{appdir}/examples/META-INF
289    echo '<?xml version="1.0" encoding="UTF-8"?>'>context.xml
290    echo '<Context allowLinking="true"/>'>>context.xml
291    popd
292    %{__mkdir_p} ${RPM_BUILD_ROOT}%{appdir}/examples/WEB-INF/lib
293    pushd ${RPM_BUILD_ROOT}%{appdir}/examples/WEB-INF/lib
294    %{__ln_s} -f $(build-classpath jakarta-taglibs-core) jstl.jar
295    %{__ln_s} -f $(build-classpath jakarta-taglibs-standard) standard.jar
296    popd
297    
298  # inject OSGi manifests  # inject OSGi manifests
299  mkdir -p META-INF  mkdir -p META-INF
300  cp -p %{SOURCE8} META-INF/MANIFEST.MF  cp -p %{SOURCE8} META-INF/MANIFEST.MF
# Line 316  zip -u output/build/bin/tomcat-juli.jar Line 335  zip -u output/build/bin/tomcat-juli.jar
335  %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{libdir}  %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{libdir}
336  %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{logdir}  %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{logdir}
337  /bin/touch ${RPM_BUILD_ROOT}%{logdir}/catalina.out  /bin/touch ${RPM_BUILD_ROOT}%{logdir}/catalina.out
338    %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{_localstatedir}/run
339    /bin/touch ${RPM_BUILD_ROOT}%{_localstatedir}/run/%{name}.pid
340  /bin/echo "%{name}-%{major_version}.%{minor_version}.%{micro_version} RPM installed" >> ${RPM_BUILD_ROOT}%{logdir}/catalina.out  /bin/echo "%{name}-%{major_version}.%{minor_version}.%{micro_version} RPM installed" >> ${RPM_BUILD_ROOT}%{logdir}/catalina.out
341  %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{homedir}  %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{homedir}
342  %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{tempdir}  %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{tempdir}
343  %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{workdir}  %{__install} -d -m 0775 ${RPM_BUILD_ROOT}%{workdir}
344    %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_unitdir}
345    
346  # move things into place  # move things into place
347  # First copy supporting libs to tomcat lib  # First copy supporting libs to tomcat lib
# Line 349  popd Line 371  popd
371      ${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service      ${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service
372  %{__install} -m 0644 %{SOURCE17} \  %{__install} -m 0644 %{SOURCE17} \
373      ${RPM_BUILD_ROOT}%{_sbindir}/%{name}-sysd      ${RPM_BUILD_ROOT}%{_sbindir}/%{name}-sysd
374    %{__install} -m 0644 %{SOURCE19} \
375        ${RPM_BUILD_ROOT}%{_sbindir}/%{name}-jsvc
376    %{__install} -m 0644 %{SOURCE20} \
377        ${RPM_BUILD_ROOT}%{_unitdir}/%{name}-jsvc.service
378    %{__install} -m 0644 %{SOURCE18} \
379        ${RPM_BUILD_ROOT}%{_sbindir}/%{name}-jsvc-sysd
380  %{__ln_s} %{name} ${RPM_BUILD_ROOT}%{_sbindir}/d%{name}  %{__ln_s} %{name} ${RPM_BUILD_ROOT}%{_sbindir}/d%{name}
381  %{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE5} \  %{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE5} \
382      > ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}      > ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}
# Line 389  pushd ${RPM_BUILD_ROOT}%{libdir} Line 417  pushd ${RPM_BUILD_ROOT}%{libdir}
417      %{__ln_s} $(build-classpath log4j) log4j.jar      %{__ln_s} $(build-classpath log4j) log4j.jar
418      %{__ln_s} $(build-classpath ecj) jasper-jdt.jar      %{__ln_s} $(build-classpath ecj) jasper-jdt.jar
419    
420      # Link the juli jar here from /usr/share/java/tomcat      # Temporary copy the juli jar here from /usr/share/java/tomcat (for maven depmap)
421      %{__ln_s} %{bindir}/tomcat-juli.jar .      %{__cp} -a ${RPM_BUILD_ROOT}%{bindir}/tomcat-juli.jar ./
422  popd  popd
423    
424  # symlink to the FHS locations where we've installed things  # symlink to the FHS locations where we've installed things
# Line 411  popd Line 439  popd
439  %{__rm} ${RPM_BUILD_ROOT}%{appdir}/docs/appdev/sample/sample.war  %{__rm} ${RPM_BUILD_ROOT}%{appdir}/docs/appdev/sample/sample.war
440    
441    
 # Generate a depmap fragment javax.servlet:servlet-api pointing to  
 # tomcat-servlet-3.0-api for backwards compatibility  
 %add_to_maven_depmap javax.servlet servlet-api %{servletspec} JPP %{name}-servlet-%{servletspec}-api  
 # also provide jetty depmap (originally in jetty package, but it's cleaner to have it here)  
 %add_to_maven_depmap org.mortbay.jetty servlet-api %{servletspec} JPP %{name}-servlet-%{servletspec}-api  
 mv %{buildroot}%{_mavendepmapfragdir}/%{name} %{buildroot}%{_mavendepmapfragdir}/%{name}-servlet-api  
   
442  # Install the maven metadata  # Install the maven metadata
443  %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_mavenpomdir}  %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_mavenpomdir}
444  pushd output/dist/src/res/maven  pushd output/dist/src/res/maven
# Line 427  for pom in *.pom; do Line 448  for pom in *.pom; do
448  done  done
449    
450  # we won't install dbcp, juli-adapters and juli-extras pom files  # we won't install dbcp, juli-adapters and juli-extras pom files
451  for pom in tomcat-annotations-api.pom tomcat-catalina.pom tomcat-jasper-el.pom tomcat-jasper.pom \  for libname in annotations-api catalina jasper-el jasper catalina-ha; do
452             tomcat-catalina-ha.pom tomcat-el-api.pom; do      %{__cp} -a %{name}-$libname.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-$libname.pom
453      %{__cp} -a $pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-$pom      %add_maven_depmap JPP.%{name}-$libname.pom %{name}/$libname.jar
     base=`basename $pom .pom`  
     %add_to_maven_depmap org.apache.tomcat $base %{version} JPP/%{name} $base  
454  done  done
455    
456  # servlet-api jsp-api and el-api are not in tomcat subdir, since they are widely re-used elsewhere  # servlet-api jsp-api and el-api are not in tomcat subdir, since they are widely re-used elsewhere
457  for pom in tomcat-jsp-api.pom tomcat-servlet-api.pom tomcat-el-api.pom;do  %{__cp} -a tomcat-jsp-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-tomcat-jsp-api.pom
458      %{__cp} -a $pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-%{name}-$pom  %add_maven_depmap JPP-tomcat-jsp-api.pom tomcat-jsp-api.jar -f "tomcat-jsp-api" -a "javax.servlet.jsp:javax.servlet.jsp-api,javax.servlet:jsp-api"
459      base=`basename $pom .pom`  
460      %add_to_maven_depmap org.apache.tomcat $base %{version} JPP %{name}-$base  %{__cp} -a tomcat-el-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-tomcat-el-api.pom
461  done  %add_maven_depmap JPP-tomcat-el-api.pom tomcat-el-api.jar -f "tomcat-el-api" -a "javax.el:javax.el-api,javax.el:el-api"
462    
463    %{__cp} -a tomcat-servlet-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP-tomcat-servlet-api.pom
464    # Generate a depmap fragment javax.servlet:servlet-api pointing to
465    # tomcat-servlet-3.0-api for backwards compatibility
466    # also provide jetty depmap (originally in jetty package, but it's cleaner to have it here
467    %add_maven_depmap JPP-tomcat-servlet-api.pom tomcat-servlet-api.jar -f "tomcat-servlet-api" -a "javax.servlet:servlet-api,javax.servlet:javax.servlet-api,org.mortbay.jetty:servlet-api"
468    
469  # two special pom where jar files have different names  # two special pom where jar files have different names
470  %{__cp} -a tomcat-tribes.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-catalina-tribes.pom  %{__cp} -a tomcat-tribes.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-catalina-tribes.pom
471  %add_to_maven_depmap org.apache.tomcat tribes %{version} JPP/%{name} catalina-tribes  %add_maven_depmap JPP.%{name}-catalina-tribes.pom %{name}/catalina-tribes.jar
472    
473  %{__cp} -a tomcat-juli.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-juli.pom  %{__cp} -a tomcat-juli.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-juli.pom
474  %add_to_maven_depmap org.apache.tomcat juli %{version} JPP/%{name} tomcat-juli  %add_maven_depmap JPP.%{name}-tomcat-juli.pom %{name}/tomcat-juli.jar
475    
476    %{__cp} -a tomcat-api.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-api.pom
477    %add_maven_depmap JPP.%{name}-tomcat-api.pom %{name}/tomcat-api.jar
478    
479    %{__cp} -a tomcat-util.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-util.pom
480    %add_maven_depmap JPP.%{name}-tomcat-util.pom %{name}/tomcat-util.jar
481    
482    # replace temporary copy with link
483    %{__ln_s} -f %{bindir}/tomcat-juli.jar ${RPM_BUILD_ROOT}%{libdir}/
484    
485    mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/lib/tmpfiles.d
486    cat > ${RPM_BUILD_ROOT}%{_prefix}/lib/tmpfiles.d/%{name}.conf <<EOF
487    f %{_localstatedir}/run/%{name}.pid 0644 tomcat tomcat -
488    EOF
489    
490    
491  %pre  %pre
# Line 463  if [ $1 -eq 1 ]; then Line 502  if [ $1 -eq 1 ]; then
502      /bin/systemctl daemon-reload >/dev/null 2>&1 || :      /bin/systemctl daemon-reload >/dev/null 2>&1 || :
503  fi  fi
504    
505    %post systemv
506    # install but don't activate
507    /sbin/chkconfig --add %{name}
508    
509  %post jsp-%{jspspec}-api  %post jsp-%{jspspec}-api
510  %{_sbindir}/update-alternatives --install %{_javadir}/jsp.jar jsp \  %{_sbindir}/update-alternatives --install %{_javadir}/jsp.jar jsp \
511      %{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20100      %{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20200
512    
513  %post servlet-%{servletspec}-api  %post servlet-%{servletspec}-api
514  %{_sbindir}/update-alternatives --install %{_javadir}/servlet.jar servlet \  %{_sbindir}/update-alternatives --install %{_javadir}/servlet.jar servlet \
515      %{_javadir}/%{name}-servlet-%{servletspec}-api.jar 20500      %{_javadir}/%{name}-servlet-%{servletspec}-api.jar 30000
 %update_maven_depmap  
516    
517  %post el-%{elspec}-api  %post el-%{elspec}-api
518  %{_sbindir}/update-alternatives --install %{_javadir}/elspec.jar elspec \  %{_sbindir}/update-alternatives --install %{_javadir}/elspec.jar elspec \
519     %{_javadir}/%{name}-el-%{elspec}-api.jar 20250     %{_javadir}/%{name}-el-%{elspec}-api.jar 20300
520    
521    %preun systemv
522        %{_initrddir}/%{name} stop >/dev/null 2>&1
523        /sbin/chkconfig --del %{name}
524    
525  %preun  %preun
526  # clean tempdir and workdir on removal or upgrade  # clean tempdir and workdir on removal or upgrade
527  %{__rm} -rf %{workdir}/* %{tempdir}/*  %{__rm} -rf %{workdir}/* %{tempdir}/*
528  if [ "$1" = "0" ]; then  if [ "$1" = "0" ]; then
     %{_initrddir}/%{name} stop >/dev/null 2>&1  
     /sbin/chkconfig --del %{name}  
529      # package removal, not upgrade      # package removal, not upgrade
530      /bin/systemctl --no-reload disable tomcat.service > /dev/null 2>&1 || :      /bin/systemctl --no-reload disable tomcat.service > /dev/null 2>&1 || :
531      /bin/systemctl stop tomcat.service > /dev/null 2>&1 ||      /bin/systemctl stop tomcat.service > /dev/null 2>&1 || :
532  fi  fi
533    
   
534  %postun  %postun
535  /bin/systemctl daemon-reload > /dev/null 2>&1 || :  /bin/systemctl daemon-reload > /dev/null 2>&1 || :
536  if [ $1 -ge 1 ]; then  if [ $1 -ge 1 ]; then
# Line 519  fi Line 562  fi
562  /sbin/chkconfig --del tomcat > /dev/null 2>&1 || :  /sbin/chkconfig --del tomcat > /dev/null 2>&1 || :
563  /bin/systemctl try-restart tomcat.service > /dev/null 2>&1 || :  /bin/systemctl try-restart tomcat.service > /dev/null 2>&1 || :
564    
   
565  %files  %files
566  %defattr(0664,root,tomcat,0755)  %defattr(0664,root,tomcat,0755)
567  %doc {LICENSE,NOTICE,RELEASE*}  %doc {LICENSE,NOTICE,RELEASE*}
# Line 535  fi Line 577  fi
577  %defattr(0664,root,tomcat,0770)  %defattr(0664,root,tomcat,0770)
578  %attr(0770,root,tomcat) %dir %{logdir}  %attr(0770,root,tomcat) %dir %{logdir}
579  %attr(0660,tomcat,tomcat) %{logdir}/catalina.out  %attr(0660,tomcat,tomcat) %{logdir}/catalina.out
580    %attr(0644,tomcat,tomcat) %{_localstatedir}/run/%{name}.pid
581  %attr(0770,root,tomcat) %dir %{cachedir}  %attr(0770,root,tomcat) %dir %{cachedir}
582  %attr(0770,root,tomcat) %dir %{tempdir}  %attr(0770,root,tomcat) %dir %{tempdir}
583  %attr(0770,root,tomcat) %dir %{workdir}  %attr(0770,root,tomcat) %dir %{workdir}
# Line 547  fi Line 590  fi
590  %attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/*.properties  %attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/*.properties
591  %attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/context.xml  %attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/context.xml
592  %attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/server.xml  %attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/server.xml
 %attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/log4j.properties  
593  %attr(0660,tomcat,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml  %attr(0660,tomcat,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml
594  %attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/web.xml  %attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/web.xml
595  %dir %{homedir}  %dir %{homedir}
596  %{bindir}/bootstrap.jar  %{bindir}/bootstrap.jar
597    %{_prefix}/lib/tmpfiles.d/%{name}.conf
598  %{bindir}/catalina-tasks.xml  %{bindir}/catalina-tasks.xml
599  %{homedir}/lib  %{homedir}/lib
600  %{homedir}/temp  %{homedir}/temp
# Line 559  fi Line 602  fi
602  %{homedir}/work  %{homedir}/work
603  %{homedir}/logs  %{homedir}/logs
604  %{homedir}/conf  %{homedir}/conf
 %{_mavendepmapfragdir}/%{name}  
 %{_mavenpomdir}/*.pom  
 # Exclude the POMs that are in sub-packages  
 %exclude %{_mavenpomdir}/*api*  
605    
606  %files admin-webapps  %files admin-webapps
607  %defattr(0664,root,tomcat,0755)  %defattr(0664,root,tomcat,0755)
# Line 570  fi Line 609  fi
609  %{appdir}/manager  %{appdir}/manager
610    
611  %files docs-webapp  %files docs-webapp
612    %defattr(-,root,root,-)
613  %{appdir}/docs  %{appdir}/docs
614    
615  %files javadoc  %files javadoc
616    %defattr(-,root,root,-)
617  %{_javadocdir}/%{name}  %{_javadocdir}/%{name}
618    
619  %files jsp-%{jspspec}-api  %files jsp-%{jspspec}-api
620    %defattr(-,root,root,-)
621  %{_javadir}/%{name}-jsp-%{jspspec}*.jar  %{_javadir}/%{name}-jsp-%{jspspec}*.jar
622  %{_javadir}/%{name}-jsp-api.jar  %{_javadir}/%{name}-jsp-api.jar
623  %{_mavenpomdir}/JPP-%{name}-tomcat-jsp-api.pom  %{_mavenpomdir}/JPP-%{name}-jsp-api.pom
624    %{_mavendepmapfragdir}/%{name}-tomcat-jsp-api
625    
626  %files lib  %files lib
627    %defattr(-,root,root,-)
628  %{libdir}  %{libdir}
629  %{bindir}/tomcat-juli.jar  %{bindir}/tomcat-juli.jar
630    %{_mavendepmapfragdir}/%{name}
631    %{_mavenpomdir}/JPP.%{name}-annotations-api.pom
632    %{_mavenpomdir}/JPP.%{name}-catalina-ha.pom
633    %{_mavenpomdir}/JPP.%{name}-catalina-tribes.pom
634    %{_mavenpomdir}/JPP.%{name}-catalina.pom
635    %{_mavenpomdir}/JPP.%{name}-jasper-el.pom
636    %{_mavenpomdir}/JPP.%{name}-jasper.pom
637    %{_mavenpomdir}/JPP.%{name}-tomcat-api.pom
638    %{_mavenpomdir}/JPP.%{name}-tomcat-juli.pom
639    %{_mavenpomdir}/JPP.%{name}-tomcat-util.pom
640    
641  %exclude %{libdir}/%{name}-el-%{elspec}-api.jar  %exclude %{libdir}/%{name}-el-%{elspec}-api.jar
642    
643  %files servlet-%{servletspec}-api  %files servlet-%{servletspec}-api
644    %defattr(-,root,root,-)
645  %doc LICENSE  %doc LICENSE
646  %{_javadir}/%{name}-servlet-%{servletspec}*.jar  %{_javadir}/%{name}-servlet-%{servletspec}*.jar
647  %{_javadir}/%{name}-servlet-api.jar  %{_javadir}/%{name}-servlet-api.jar
648  %{_mavendepmapfragdir}/%{name}-servlet-api  %{_mavendepmapfragdir}/%{name}-tomcat-servlet-api
649  %{_mavenpomdir}/JPP-%{name}-tomcat-servlet-api.pom  %{_mavenpomdir}/JPP-%{name}-servlet-api.pom
650    
651  %files el-%{elspec}-api  %files el-%{elspec}-api
652    %defattr(-,root,root,-)
653  %doc LICENSE  %doc LICENSE
654  %{_javadir}/%{name}-el-%{elspec}-api.jar  %{_javadir}/%{name}-el-%{elspec}-api.jar
655  %{_javadir}/%{name}-el-api.jar  %{_javadir}/%{name}-el-api.jar
656  %{libdir}/%{name}-el-%{elspec}-api.jar  %{libdir}/%{name}-el-%{elspec}-api.jar
657  %{_mavenpomdir}/JPP-%{name}-tomcat-el-api.pom  %{_mavenpomdir}/JPP-%{name}-el-api.pom
658    %{_mavendepmapfragdir}/%{name}-tomcat-el-api
659    
660    
661  %files webapps  %files webapps
662  %defattr(0644,tomcat,tomcat,0755)  %defattr(0644,tomcat,tomcat,0755)
# Line 610  fi Line 669  fi
669  %{_sbindir}/d%{name}  %{_sbindir}/d%{name}
670  %{_initrddir}/%{name}  %{_initrddir}/%{name}
671    
672    %files jsvc
673    %defattr(755,root,root,0755)
674    %{_sbindir}/%{name}-jsvc
675    %{_sbindir}/%{name}-jsvc-sysd
676    %attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service
677    
Legend:
Removed from v.338836  
changed lines
  Added in v.338837
  ViewVC Help
Powered by ViewVC 1.1.30