[tomcat6/f16] Drop %update_maven_depmap (Bug #724985)

Orion Poplawski orion at fedoraproject.org
Wed Aug 31 15:50:22 UTC 2011


commit 7d5cc8ec8683a7ea2945139dcb6c1fd9e320559b
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Wed Aug 31 09:48:16 2011 -0600

    Drop %update_maven_depmap (Bug #724985)

 tomcat6.spec |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/tomcat6.spec b/tomcat6.spec
index 6e33497..6affb02 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -53,7 +53,7 @@
 Name:          tomcat6
 Epoch:         0
 Version:       %{major_version}.%{minor_version}.%{micro_version}
-Release:       13%{?dist}
+Release:       14%{?dist}
 Summary:       Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 Group:         Networking/Daemons
@@ -108,8 +108,6 @@ Requires(post):   chkconfig
 Requires(preun):  chkconfig
 Requires(post):   redhat-lsb
 Requires(preun):  redhat-lsb
-Requires(post):   jpackage-utils
-Requires(postun): jpackage-utils
 
 # added after log4j sub-package was removed
 Provides:         %{name}-log4j = %{epoch}:%{version}-%{release}
@@ -427,7 +425,6 @@ done
 %post
 # install but don't activate
 /sbin/chkconfig --add %{name}
-%update_maven_depmap
 
 %post jsp-%{jspspec}-api
 %{_sbindir}/update-alternatives --install %{_javadir}/jsp.jar jsp \
@@ -436,7 +433,6 @@ done
 %post servlet-%{servletspec}-api
 %{_sbindir}/update-alternatives --install %{_javadir}/servlet.jar servlet \
     %{_javadir}/%{name}-servlet-%{servletspec}-api.jar 20500
-%update_maven_depmap
 
 %post el-%{elspec}-api
 %{_sbindir}/update-alternatives --install %{_javadir}/elspec.jar elspec \
@@ -478,9 +474,6 @@ if [ "$1" = "0" ]; then
 fi
 
 
-%postun
-%update_maven_depmap
-
 %postun jsp-%{jspspec}-api
 if [ "$1" = "0" ]; then
     %{_sbindir}/update-alternatives --remove jsp \
@@ -491,7 +484,6 @@ fi
 if [ "$1" = "0" ]; then
     %{_sbindir}/update-alternatives --remove servlet \
         %{_javadir}/%{name}-servlet-%{servletspec}-api.jar
-    %update_maven_depmap
 fi
 
 %postun el-%{elspec}-api
@@ -587,6 +579,9 @@ fi
 %{appdir}/sample
 
 %changelog
+* Wed Aug 31 2011 Orion Poplawski <orion at cora.nwra.com> 0:6.0.32-14
+- Drop %%update_maven_depmap (Bug #724985)
+
 * Wed Aug 10 2011 David Knox <dknox at redhat.com> 0:6.0.32-13
 - Resolves use java-devel and java instead of BR java-1.6.0-devel
 - and R java-1.6.0


More information about the scm-commits mailing list