Hello community, here is the log from the commit of package struts checked in at Thu Aug 23 23:55:45 CEST 2007. -------- --- struts/struts.changes 2007-05-02 11:54:19.000000000 +0200 +++ /mounts/work_src_done/NOARCH/struts/struts.changes 2007-08-21 10:46:13.206592000 +0200 @@ -1,0 +2,8 @@ +Tue Aug 21 10:39:42 CEST 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 + +------------------------------------------------------------------- Old: ---- minmem New: ---- tomcat5-context-allowlinking.xml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ struts.spec ++++++ --- /var/tmp/diff_new_pack.Hi1336/_old 2007-08-23 23:55:10.000000000 +0200 +++ /var/tmp/diff_new_pack.Hi1336/_new 2007-08-23 23:55:10.000000000 +0200 @@ -13,26 +13,28 @@ 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 +BuildRequires: java-1_4_2-gcj-compat-devel tomcat55 %define name struts %define full_name jakarta-%{name} %define version 1.2.9 %define release 2jpp +%define tomcat5dir tomcat55 #%define tomcat3appsdir %{_localstatedir}/tomcat3/webapps #%define tomcat4appsdir %{_localstatedir}/lib/tomcat4/webapps -%define tomcat5appsdir /srv/www/tomcat5/base/webapps -%define tomcat5ctxdir %{_sysconfdir}/tomcat5/base/Catalina/localhost +%define tomcat5appsdir /srv/www/%{tomcat5dir}/base/webapps +%define tomcat5ctxdir %{_sysconfdir}/%{tomcat5dir}/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: 23 +Release: 83 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/ Requires: servlet @@ -95,7 +97,7 @@ Summary: Sample struts webapps for tomcat5 Group: Development/Libraries/Java Requires: %{name} = %{version}-%{release} -Requires: tomcat5 +Requires: tomcat55 PreReq: /usr/sbin/useradd, /usr/sbin/groupadd @@ -194,7 +196,7 @@ /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}/tomcat5 tomcat 2> /dev/null || : + -d %{_datadir}/%{tomcat5dir} tomcat 2> /dev/null || : %clean rm -rf $RPM_BUILD_ROOT @@ -204,14 +206,6 @@ %doc INSTALL README %{_javadir}/* %{_datadir}/%{name} -%defattr(-,tomcat,tomcat) -%dir %attr(-,root,root) /etc/tomcat5 -%dir /etc/tomcat5/base -%dir /etc/tomcat5/base/Catalina -%dir %attr(-,root,root) /srv/www/tomcat5 -%dir /srv/www/tomcat5/base -%dir /etc/tomcat5/base/Catalina/localhost -%dir /srv/www/tomcat5/base/webapps %files manual %defattr(-,root,root) @@ -227,26 +221,19 @@ %files webapps-tomcat5 %defattr(-,tomcat,tomcat) -%dir %attr(-,root,root) /etc/tomcat5 -%dir /etc/tomcat5/base -%dir /etc/tomcat5/base/Catalina -%dir %attr(-,root,root) /srv/www/tomcat5 -%dir /srv/www/tomcat5/base -%dir /etc/tomcat5/base/Catalina/localhost -%dir /srv/www/tomcat5/base/webapps -%dir %{tomcat5appsdir}/%{name}-blank -%{tomcat5appsdir}/%{name}-blank/* -%dir %{tomcat5appsdir}/%{name}-documentation -%{tomcat5appsdir}/%{name}-documentation/* -%dir %{tomcat5appsdir}/%{name}-example -%{tomcat5appsdir}/%{name}-example/* -%dir %{tomcat5appsdir}/%{name}-examples -%{tomcat5appsdir}/%{name}-examples/* -%dir %{tomcat5appsdir}/%{name}-tiles-documentation -%{tomcat5appsdir}/%{name}-tiles-documentation/* +%{tomcat5appsdir}/%{name}-blank +%{tomcat5appsdir}/%{name}-documentation +%{tomcat5appsdir}/%{name}-example +%{tomcat5appsdir}/%{name}-examples +%{tomcat5appsdir}/%{name}-tiles-documentation %{tomcat5ctxdir}/%{name}-*.xml %changelog +* 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 - added unzip to BuildRequires * Thu Jan 11 2007 - dbornkessel@suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org