Hello community, here is the log from the commit of package struts checked in at Sat Mar 22 11:29:47 CET 2008. -------- --- struts/struts.changes 2007-09-03 17:05:53.000000000 +0200 +++ /mounts/work_src_done/NOARCH/struts/struts.changes 2008-03-20 13:02:59.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Mar 20 13:00:01 CET 2008 - anosek@suse.cz + +- struts-webapps-tomcat now depends on tomcat6 + +------------------------------------------------------------------- Old: ---- minmem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ struts.spec ++++++ --- /var/tmp/diff_new_pack.q18045/_old 2008-03-22 11:29:36.000000000 +0100 +++ /var/tmp/diff_new_pack.q18045/_new 2008-03-22 11:29:36.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package struts (Version 1.2.9) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,6 +11,7 @@ # norootforbuild # icecream 0 + Name: struts BuildRequires: ant-apache-oro ant-apache-regexp ant-nodeps ant-trax antlr classpath jakarta-commons-beanutils jakarta-commons-digester jakarta-commons-fileupload jakarta-commons-logging jakarta-commons-validator oro servletapi5 unzip update-alternatives xalan-j2 BuildRequires: java-1_4_2-gcj-compat-devel @@ -18,25 +19,26 @@ %define full_name jakarta-%{name} %define version 1.2.9 %define release 2jpp -%define tomcat5dir tomcat55 +%define tomcat6dir tomcat6 +#%define tomcat5dir tomcat55 #%define tomcat3appsdir %{_localstatedir}/tomcat3/webapps #%define tomcat4appsdir %{_localstatedir}/lib/tomcat4/webapps -%define tomcat5appsdir /srv/www/%{tomcat5dir}/base/webapps -%define tomcat5ctxdir %{_sysconfdir}/%{tomcat5dir}/Catalina/localhost +%define tomcat6appsdir /srv/%{tomcat6dir}/webapps +%define tomcat6ctxdir %{_sysconfdir}/%{tomcat6dir}/Catalina/localhost %define section free %define webapps blank documentation example examples tiles-documentation %define webapplibs commons-beanutils commons-digester commons-fileupload commons-validator oro struts %define jdkmajorver 1.4 %define legacyver 1.0 Version: 1.2.9 -Release: 97 +Release: 162 Summary: Web application framework License: The Apache Software License Group: Development/Libraries/Java Source0: struts-1.2.9-src.tar.bz2 Source3: tomcat5-context-allowlinking.xml Patch0: build-webapps.xml-entity-lookup.patch -URL: http://jakarta.apache.org/struts/ +Url: http://jakarta.apache.org/struts/ Requires: servlet Recommends: jdbc-stdext Requires: jakarta-commons-beanutils >= 1.6.1 @@ -45,7 +47,7 @@ Requires: jakarta-commons-validator >= 1.0.2 Requires: oro >= 2.0.7 Group: Development/Libraries/Java -Buildarch: noarch +BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -93,15 +95,14 @@ -%package webapps-tomcat5 +%package webapps-tomcat6 Summary: Sample struts webapps for tomcat5 Group: Development/Libraries/Java Requires: %{name} = %{version}-%{release} -Requires: tomcat55 +Requires: tomcat6 PreReq: /usr/sbin/useradd, /usr/sbin/groupadd - -%description webapps-tomcat5 +%description webapps-tomcat6 Welcome to the Struts Framework! The goal of this project is to provide an open source framework useful in building web applications with Java Servlet and JavaServer Pages (JSP) technology. @@ -177,26 +178,26 @@ # (cd $RPM_BUILD_ROOT%{tomcat4appsdir}/%{name}-$webapp/WEB-INF \ # && for tld in ../../../../../..%{_datadir}/%{name}/*.tld; do ln -sf $tld `basename $tld`; done) #done -# tomcat 5 webapps -install -d -m 755 $RPM_BUILD_ROOT%{tomcat5appsdir} -install -d -m 755 $RPM_BUILD_ROOT%{tomcat5ctxdir} +# tomcat 6 webapps +install -d -m 755 $RPM_BUILD_ROOT%{tomcat6appsdir} +install -d -m 755 $RPM_BUILD_ROOT%{tomcat6ctxdir} for webapp in %{webapps}; do - cp -pr target/$webapp $RPM_BUILD_ROOT%{tomcat5appsdir}/%{name}-$webapp - cat %{SOURCE3} | sed -e "s/@@@APPNAME@@@/$webapp/g;" > $RPM_BUILD_ROOT%{tomcat5ctxdir}/%{name}-$webapp.xml + cp -pr target/$webapp $RPM_BUILD_ROOT%{tomcat6appsdir}/%{name}-$webapp + cat %{SOURCE3} | sed -e "s/@@@APPNAME@@@/$webapp/g;" > $RPM_BUILD_ROOT%{tomcat6ctxdir}/%{name}-$webapp.xml # XXX: move to %%post/preun for jar in %{webapplibs}; do - (cd $RPM_BUILD_ROOT%{tomcat5appsdir}/%{name}-$webapp/WEB-INF/lib \ - && ln -sf ../../../../../../../..%{_javadir}/$jar.jar .) + (cd $RPM_BUILD_ROOT%{tomcat6appsdir}/%{name}-$webapp/WEB-INF/lib \ + && ln -sf ../../../../../..%{_javadir}/$jar.jar .) done - (cd $RPM_BUILD_ROOT%{tomcat5appsdir}/%{name}-$webapp/WEB-INF \ - && for tld in ../../../../../../..%{_datadir}/%{name}/*.tld; do ln -sf $tld `basename $tld`; done) + (cd $RPM_BUILD_ROOT%{tomcat6appsdir}/%{name}-$webapp/WEB-INF \ + && for tld in ../../../../..%{_datadir}/%{name}/*.tld; do ln -sf $tld `basename $tld`; done) done %pre /usr/sbin/groupadd -r tomcat 2> /dev/null || : /usr/sbin/useradd -r -g tomcat -s /bin/bash \ -c "Tomcat - Apache Servlet/JSP Engine" \ - -d %{_datadir}/%{tomcat5dir} tomcat 2> /dev/null || : + -d %{_datadir}/%{tomcat6dir} tomcat 2> /dev/null || : %clean rm -rf $RPM_BUILD_ROOT @@ -219,32 +220,33 @@ %defattr(-,root,root) %{_javadocdir}/%{name}-%{version} -%files webapps-tomcat5 +%files webapps-tomcat6 %defattr(-,tomcat,tomcat) -%dir /srv/www/%{tomcat5dir} -%dir /srv/www/%{tomcat5dir}/base -%dir /srv/www/%{tomcat5dir}/base/webapps -%dir %{_sysconfdir}/%{tomcat5dir} -%dir %{_sysconfdir}/%{tomcat5dir}/Catalina -%dir %{_sysconfdir}/%{tomcat5dir}/Catalina/localhost -%{tomcat5appsdir}/%{name}-blank -%{tomcat5appsdir}/%{name}-documentation -%{tomcat5appsdir}/%{name}-example -%{tomcat5appsdir}/%{name}-examples -%{tomcat5appsdir}/%{name}-tiles-documentation -%{tomcat5ctxdir}/%{name}-*.xml +%dir /srv/%{tomcat6dir} +%dir /srv/%{tomcat6dir}/webapps +%dir %{_sysconfdir}/%{tomcat6dir} +%dir %{_sysconfdir}/%{tomcat6dir}/Catalina +%dir %{_sysconfdir}/%{tomcat6dir}/Catalina/localhost +%{tomcat6appsdir}/%{name}-blank +%{tomcat6appsdir}/%{name}-documentation +%{tomcat6appsdir}/%{name}-example +%{tomcat6appsdir}/%{name}-examples +%{tomcat6appsdir}/%{name}-tiles-documentation +%{tomcat6ctxdir}/%{name}-*.xml %changelog -* Mon Sep 03 2007 - anosek@suse.de +* Thu Mar 20 2008 anosek@suse.cz +- struts-webapps-tomcat now depends on tomcat6 +* Mon Sep 03 2007 anosek@suse.de - removed tomcat55 from BuildRequires because of cyclic dependency -* Tue Aug 21 2007 - anosek@suse.cz +* Tue Aug 21 2007 anosek@suse.cz - fixed unresolvable dependency: struts-webapps-tomcat5 -> tomcat5 [#297708] * added tomcat55 to Requires and BuildRequires * changed files locations to fit tomcat55 directory structure * don't pack directories which are already owned by tomcat55 package -* Wed May 02 2007 - dbornkessel@suse.de +* Wed May 02 2007 dbornkessel@suse.de - added unzip to BuildRequires -* Thu Jan 11 2007 - dbornkessel@suse.de +* Thu Jan 11 2007 dbornkessel@suse.de - big update from 1.2.4 to 1.2.9, which fixes a lot of issues: 1.2.9: - TagUtils doesn't create XHTML compliant URLs using forwards defined with redirect="true". @@ -350,30 +352,30 @@ - * added prepareName() method - * use getters rather than instance variables - * refactored SubmitTag - ButtonTag, CancelTag and ResetTag now inherit from SubmitTag. -* Thu Sep 28 2006 - skh@suse.de +* Thu Sep 28 2006 skh@suse.de - add xalan-j2 to BuildRequires and xalan-j2-serializer.jar to build classpath - don't use icecream - use source="1.4" and target="1.4" for build with java 1.5 -* Wed May 24 2006 - dbornkessel@suse.de +* Wed May 24 2006 dbornkessel@suse.de - changed hard requirement on jdbc-stdext to 'Recommends', as it is not available on some platforms (s390[x]) Bug 177909 -* Thu Apr 27 2006 - dbornkessel@suse.de +* Thu Apr 27 2006 dbornkessel@suse.de - backported struts security fixes from 1.2.9 -> 1.2.4 Struts bugs: * Bug 38374 - Validation always skipped with Globals.CANCEL_KEY. * Bug 38534 - DOS attack, application hack. * Bug 38749 - XSS vulnerability in LookupDispatchAction. Novell bug: 162429 -* Mon Apr 24 2006 - dbornkessel@suse.de +* Mon Apr 24 2006 dbornkessel@suse.de - bug #140311 fix (file list changed) -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Thu Sep 29 2005 - dmueller@suse.de +* Thu Sep 29 2005 dmueller@suse.de - add norootforbuild -* Mon Mar 14 2005 - skh@suse.de +* Mon Mar 14 2005 skh@suse.de - use correct tomcat5 directories for webapps (#63194) -* Tue Feb 22 2005 - skh@suse.de +* Tue Feb 22 2005 skh@suse.de - update to version 1.2.4 -* Mon Sep 06 2004 - skh@suse.de +* Mon Sep 06 2004 skh@suse.de - Initial package created with version 1.1 (JPackage 1.5) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org