Author: pawelz Date: Mon Aug 17 14:03:40 2009 GMT
Module: packages Tag: DEVEL
---- Log message:
- removed context files for tomact5 specific webapps
---- Files affected:
packages/tomcat:
tomcat.spec (1.124.2.4 -> 1.124.2.5) , apache-tomcat-context-balancer.xml
(1.1 -> NONE) (REMOVED), apache-tomcat-context-jsp-examples.xml (1.1 -> NONE)
(REMOVED), apache-tomcat-context-tomcat-docs.xml (1.1 -> NONE) (REMOVED),
apache-tomcat-context-webdav.xml (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/tomcat/tomcat.spec
diff -u packages/tomcat/tomcat.spec:1.124.2.4
packages/tomcat/tomcat.spec:1.124.2.5
--- packages/tomcat/tomcat.spec:1.124.2.4 Fri Aug 14 09:37:44 2009
+++ packages/tomcat/tomcat.spec Mon Aug 17 16:03:35 2009
@@ -20,11 +20,11 @@
Source1: apache-%{name}.init
Source2: apache-%{name}.sysconfig
Source3: %{name}-build.properties
-Source10: apache-%{name}-context-ROOT.xml
-Source11: apache-%{name}-context-balancer.xml
-Source12: apache-%{name}-context-jsp-examples.xml
-Source13: apache-%{name}-context-tomcat-docs.xml
-Source14: apache-%{name}-context-webdav.xml
+Source10: %{name}-context-ROOT.xml
+Source11: %{name}-context-docs.xml
+Source12: %{name}-context-manager.xml
+Source13: %{name}-context-host-manager.xml
+Source14: %{name}-context-examples.xml
Patch0: %{name}-build.xml.patch
URL: http://tomcat.apache.org/
BuildRequires: apr-devel
@@ -66,7 +66,6 @@
Requires: java-commons-pool-tomcat5
Requires: java-jdbc-mysql
Requires: java-regexp
-Requires: java-servletapi5 = %{version}
Requires: java-xml-commons
Requires: javamail >= 1.2
Requires: jaxp_parser_impl
@@ -109,31 +108,65 @@
Java Servlet i JavaServer Pages są rozwijane przez Suna zgodnie z Java
Community Process.
-%package doc
+%package webapp-docs
Summary: The Apache Tomcat Servlet/JSP Container documentation
Summary(pl.UTF-8): Dokumentacja do Tomcata - kontenera Servlet/JSP
Group: Documentation
Obsoletes: apache-tomcat-doc
Obsoletes: jakarta-tomcat-doc
+Obsoletes: %{name}-doc
-%description doc
+%description webapp-docs
The Tomcat Servlet/JSP Container documentation.
-%description doc -l pl.UTF-8
+%description webapp-docs -l pl.UTF-8
Dokumentacja do Tomcata - kontenera Servlet/JSP.
-%package admin
-Summary: Apache Tomcat`s Administration Web Application
-Summary(pl.UTF-8): Panel Administracyjny dla Apache Tomcat
+%package webapp-manager
+Summary: The Apache Tomcat Servlet/JSP application manager
+Summary(pl.UTF-8): Zarządca aplikacji w Tomcacie
Group: Networking/Daemons/Java/Servlets
-Requires: %{name} = %{version}-%{release}
-Requires: java-commons-chain
-%description admin
-Administration Web Application for Apache Tomcat.
+%description webapp-manager
+The Apache Tomcat Servlet/JSP application manager.
-%description admin -l pl.UTF-8
-Panel Administracyjny dla Apache Tomcat.
+%description webapp-manager -l pl.UTF-8
+Zarządca aplikacji w Tomcacie.
+
+%package webapp-host-manager
+Summary: The Apache Tomcat Servlet/JSP virtual hosts manager
+Summary(pl.UTF-8): Zarządca wirtualnych hostów w Tomcacie
+Group: Networking/Daemons/Java/Servlets
+
+%description webapp-host-manager
+The Apache Tomcat Servlet/JSP virtual hosts manager.
+
+%description webapp-host-manager -l pl.UTF-8
+Zarządca wirtualnych hostów w Tomcacie.
+
+%package webapp-examples
+Summary: The Apache Tomcat Servlet/JSP example applications
+Summary(pl.UTF-8): Przykładowe aplikacje dla Tomcata
+Group: Networking/Daemons/Java/Servlets
+
+%description webapp-examples
+The Apache Tomcat Servlet/JSP example applications.
+
+%description webapp-examples -l pl.UTF-8
+Przykładowe aplikacje dla Tomcata.
+
+# %package admin
+# Summary: Apache Tomcat`s Administration Web Application
+# Summary(pl.UTF-8): Panel Administracyjny dla Apache Tomcat
+# Group: Networking/Daemons/Java/Servlets
+# Requires: %{name} = %{version}-%{release}
+# Requires: java-commons-chain
+#
+# %description admin
+# Administration Web Application for Apache Tomcat.
+#
+# %description admin -l pl.UTF-8
+# Panel Administracyjny dla Apache Tomcat.
%package jasper
Summary: JSP compiler
@@ -188,10 +221,10 @@
cp -a conf/* $CATALINADIR/conf
install -d $CATALINADIR/conf/Catalina/localhost
install %{SOURCE10} $CATALINADIR/conf/Catalina/localhost/ROOT.xml
-install %{SOURCE11} $CATALINADIR/conf/Catalina/localhost/balancer.xml
-install %{SOURCE12} $CATALINADIR/conf/Catalina/localhost/jsp-examples.xml
-install %{SOURCE13} $CATALINADIR/conf/Catalina/localhost/tomcat-docs.xml
-install %{SOURCE14} $CATALINADIR/conf/Catalina/localhost/webdav.xml
+install %{SOURCE11} $CATALINADIR/conf/Catalina/localhost/docs.xml
+install %{SOURCE12} $CATALINADIR/conf/Catalina/localhost/manager.xml
+install %{SOURCE13} $CATALINADIR/conf/Catalina/localhost/host-manager.xml
+install %{SOURCE14} $CATALINADIR/conf/Catalina/localhost/examples.xml
cp -a bin lib webapps $TOMCATDIR
cp -a temp $CATALINADIR
@@ -235,9 +268,11 @@
install -d $RPM_BUILD_ROOT%{_javadir}
mv $TOMCATDIR/lib/jasper*.jar $RPM_BUILD_ROOT%{_javadir}
+
+# XXX add softlinks jasper-compiler.jar and jasper-runtime for compatibility
with tomcat 5.5?
ln -sf %{_javadir}/jasper-compiler-jdt.jar $TOMCATDIR/lib
-ln -sf %{_javadir}/jasper-compiler.jar $TOMCATDIR/lib
-ln -sf %{_javadir}/jasper-runtime.jar $TOMCATDIR/lib
+ln -sf %{_javadir}/jasper-el.jar $TOMCATDIR/lib
+ln -sf %{_javadir}/jasper.jar $TOMCATDIR/lib
%clean
rm -rf $RPM_BUILD_ROOT
@@ -266,7 +301,7 @@
%files
%defattr(644,root,root,755)
-%doc build/{RELEASE-NOTES,RUNNING.txt}
+%doc KEYS RELEASE-NOTES RUNNING.txt
%attr(754,root,root) /etc/rc.d/init.d/tomcat
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/tomcat
%{_sysconfdir}
@@ -274,45 +309,24 @@
%dir %{_tomcatdir}/conf
%dir %{_tomcatdir}/bin
%{_tomcatdir}/bin/catalina-tasks.xml
-%{_tomcatdir}/bin/jkstatus-tasks.xml
-%{_tomcatdir}/bin/jmxaccessor-tasks.xml
%attr(755,root,root) %{_tomcatdir}/bin/*.sh
%{_tomcatdir}/bin/*.jar
-%dir %{_tomcatdir}/common
-%dir %{_tomcatdir}/common/classes
-%dir %{_tomcatdir}/common/endorsed
-%dir %{_tomcatdir}/common/i18n
-%{_tomcatdir}/common/endorsed/*.jar
-%{_tomcatdir}/common/i18n/tomcat-i18n-en.jar
-%lang(es) %{_tomcatdir}/common/i18n/tomcat-i18n-es.jar
-%lang(fr) %{_tomcatdir}/common/i18n/tomcat-i18n-fr.jar
-%lang(ja) %{_tomcatdir}/common/i18n/tomcat-i18n-ja.jar
-%{_tomcatdir}/common/lib
-%dir %{_tomcatdir}/server
-%dir %{_tomcatdir}/server/classes
-%{_tomcatdir}/server/lib
-%dir %{_tomcatdir}/server/webapps
-
-%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size)
%{_vardir}/conf/Catalina/localhost/host-manager.xml
-%{_tomcatdir}/server/webapps/host-manager
-
-%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size)
%{_vardir}/conf/Catalina/localhost/manager.xml
-%{_tomcatdir}/server/webapps/manager
+%{_tomcatdir}/lib
+%dir %{_tomcatdir}/webapps
%dir %{_tomcatdir}/webapps
%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size)
%{_vardir}/conf/Catalina/localhost/ROOT.xml
%{_tomcatdir}/webapps/ROOT
-%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size)
%{_vardir}/conf/Catalina/localhost/balancer.xml
-%{_tomcatdir}/webapps/balancer
-
-%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size)
%{_vardir}/conf/Catalina/localhost/webdav.xml
-%{_tomcatdir}/webapps/webdav
+# %config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size)
%{_vardir}/conf/Catalina/localhost/balancer.xml
+# %{_tomcatdir}/webapps/balancer
+#
+# %config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size)
%{_vardir}/conf/Catalina/localhost/webdav.xml
+# %{_tomcatdir}/webapps/webdav
%{_tomcatdir}/logs
%{_tomcatdir}/work
-%{_tomcatdir}/shared
%dir %{_vardir}
# these directory has to be writeable because /admin need to modify config
# files and create temporary files
@@ -320,10 +334,8 @@
%dir %attr(775,root,tomcat) %{_vardir}/conf/Catalina
%dir %{_vardir}/conf/Catalina/localhost
# tomcat config has to be writeable because of tomcat-users.xml file and
Catalina dir
-%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size)
%{_vardir}/conf/MANIFEST.MF
%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size)
%{_vardir}/conf/catalina.policy
%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size)
%{_vardir}/conf/*.properties*
-%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size)
%{_vardir}/conf/*.manifest
%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size)
%{_vardir}/conf/*.xml
%dir %attr(1730,root,tomcat) %{_vardir}/work
%dir %attr(775,root,tomcat) %{_vardir}/webapps
@@ -331,21 +343,31 @@
%dir %attr(775,root,tomcat) %{_logdir}/tomcat
%{_vardir}/logs
-%files doc
+%files webapp-docs
%defattr(644,root,root,755)
-%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size)
%{_vardir}/conf/Catalina/localhost/tomcat-docs.xml
-%{_tomcatdir}/webapps/tomcat-docs
+%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size)
%{_vardir}/conf/Catalina/localhost/docs.xml
+%{_tomcatdir}/webapps/docs
+
+%files webapp-manager
+%defattr(644,root,root,755)
+%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size)
%{_vardir}/conf/Catalina/localhost/manager.xml
+%{_tomcatdir}/webapps/manager
+
+%files webapp-host-manager
+%defattr(644,root,root,755)
+%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size)
%{_vardir}/conf/Catalina/localhost/host-manager.xml
+%{_tomcatdir}/webapps/host-manager
-%files admin
+%files webapp-examples
%defattr(644,root,root,755)
-%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size)
%{_vardir}/conf/Catalina/localhost/admin.xml
-%{_tomcatdir}/server/webapps/admin
+%config(noreplace) %attr(664,root,tomcat) %verify(not md5 mtime size)
%{_vardir}/conf/Catalina/localhost/examples.xml
+%{_tomcatdir}/webapps/examples
%files jasper
%defattr(644,root,root,755)
%{_javadir}/jasper-compiler-jdt.jar
-%{_javadir}/jasper-compiler.jar
-%{_javadir}/jasper-runtime.jar
+%{_javadir}/jasper-el.jar
+%{_javadir}/jasper.jar
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -353,6 +375,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.124.2.5 2009/08/17 14:03:35 pawelz
+- removed context files for tomact5 specific webapps
+
Revision 1.124.2.4 2009/08/14 07:37:44 pawelz
- %install seems to work
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat.spec?r1=1.124.2.4&r2=1.124.2.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
