Hello community, here is the log from the commit of package tomcat6 for openSUSE:Factory checked in at Tue Nov 2 16:12:21 CET 2010. -------- --- tomcat6/tomcat6.changes 2010-10-25 14:49:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/tomcat6/tomcat6.changes 2010-11-02 11:20:31.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Nov 2 10:19:13 UTC 2010 - mvyskocil@suse.cz + +- Fix bnc#650130 - Update of tomcat6 not possible (cpio: Is a directory) + * workaround the rpm bug - it cannot update directory to symlink + * make /etc/tomcat6/Catalina/ as ghost file + * create link in %posttrans + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libtcnative-1-0.spec ++++++ --- /var/tmp/diff_new_pack.2xtX0s/_old 2010-11-02 16:10:49.000000000 +0100 +++ /var/tmp/diff_new_pack.2xtX0s/_new 2010-11-02 16:10:49.000000000 +0100 @@ -29,7 +29,7 @@ Name: libtcnative-1-0 Version: %{major}.%{minor}.%{micro} -Release: 7 +Release: 8 Summary: JNI wrappers for Apache Portable Runtime for Tomcat Group: Productivity/Networking/Web/Servers License: Apache Software License .. ++++++ tomcat6.spec ++++++ --- /var/tmp/diff_new_pack.2xtX0s/_old 2010-11-02 16:10:49.000000000 +0100 +++ /var/tmp/diff_new_pack.2xtX0s/_new 2010-11-02 16:10:49.000000000 +0100 @@ -41,7 +41,7 @@ Name: tomcat6 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1 +Release: 2 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.5/JSP 2.1 API Group: Productivity/Networking/Web/Servers License: Apache Software License .. @@ -372,9 +372,7 @@ commons-dbcp-tomcat5 commons-pool-tomcat5 ecj %if %defined suse_version # bnc#424675 -%{__ln_s} %{cachedir}/Catalina ${RPM_BUILD_ROOT}/%{confdir} -%{__rm} -rf %{buildroot}/%{confdir}/Catalina -%{__ln_s} %{cachedir}/Catalina ${RPM_BUILD_ROOT}/%{confdir}/ +touch %{buildroot}/%{confdir}/Catalina # bnc#418664 install -d -m 0755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/ant.d/ echo "tomcat6/catalina-ant" > ${RPM_BUILD_ROOT}/%{_sysconfdir}/ant.d/catalina-ant @@ -429,6 +427,14 @@ /sbin/chkconfig --add %{name} %endif +%posttrans +#bnc#650130 workaround, the f*kin rpm cannot convert directory to a symlink during update +if [ ! -L %{confdir}/Catalina ]; then + %{__rm} -f %{confdir}/Catalina/Catalina + %{__rm} -rf %{confdir}/Catalina + %{__ln_s} %{cachedir}/Catalina %{confdir}/ +fi + %post el-1_0-api %{_sbindir}/update-alternatives --install %{_javadir}/el_api.jar el_api %{_javadir}/%{name}-el-%{elspec}-api.jar 10000 %{_sbindir}/update-alternatives --install %{_javadir}/el_1_0_api.jar el_1_0_api %{_javadir}/%{name}-el-%{elspec}-api.jar 10000 @@ -518,7 +524,8 @@ %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %endif %dir %{confdir} -%dir %{confdir}/Catalina +# % dir %{confdir}/Catalina +%ghost %{confdir}/Catalina %config(noreplace) %{confdir}/%{name}.conf %config(noreplace) %{confdir}/*.policy %config(noreplace) %{confdir}/*.properties @@ -530,7 +537,7 @@ %if %{defined suse_version} %dir /srv/%{name} %{_sbindir}/rc%{name} -%{confdir}/Catalina +# % {confdir}/Catalina %endif # tomcat group writtable dirs - bnc#625415 %defattr(0664,root,tomcat,0775) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org