[tomcat] Added hack for maven depmap of tomcat-juli absolute link [ -f ] pass correctly
Ivan Afonichev
van at fedoraproject.org
Sat Jan 21 23:47:38 UTC 2012
commit 56bee3dd5e225d2cfb1c4b08d4631ffdf45ccb72
Author: Ivan Afonichev <ivan.afonichev at gmail.com>
Date: Sun Jan 22 03:47:15 2012 +0400
Added hack for maven depmap of tomcat-juli absolute link [ -f ] pass correctly
tomcat.spec | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/tomcat.spec b/tomcat.spec
index 09c5b97..78a979f 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -54,7 +54,7 @@
Name: tomcat
Epoch: 0
Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
Group: System Environment/Daemons
@@ -409,8 +409,8 @@ pushd ${RPM_BUILD_ROOT}%{libdir}
%{__ln_s} $(build-classpath log4j) log4j.jar
%{__ln_s} $(build-classpath ecj) jasper-jdt.jar
- # Link the juli jar here from /usr/share/java/tomcat
- %{__ln_s} %{bindir}/tomcat-juli.jar .
+ # Temporary copy the juli jar here from /usr/share/java/tomcat (for maven depmap)
+ %{__cp} -a ${RPM_BUILD_ROOT}%{bindir}/tomcat-juli.jar ./
popd
# symlink to the FHS locations where we've installed things
@@ -464,6 +464,10 @@ done
%{__cp} -a tomcat-juli.pom ${RPM_BUILD_ROOT}%{_mavenpomdir}/JPP.%{name}-tomcat-juli.pom
%add_maven_depmap JPP.%{name}-tomcat-juli.pom %{name}/tomcat-juli.jar
+# replace temporary copy with link
+%{__ln_s} -f %{bindir}/tomcat-juli.jar ${RPM_BUILD_ROOT}%{libdir}/
+
+
%pre
# add the tomcat user and group
%{_sbindir}/groupadd -g %{tcuid} -r tomcat 2>/dev/null || :
@@ -644,6 +648,9 @@ fi
%attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service
%changelog
+* Sun Jan 22 2012 Ivan Afonichev <ivan.afonichev at gmail.com> 0:7.0.25-2
+- Added hack for maven depmap of tomcat-juli absolute link [ -f ] pass correctly
+
* Sat Jan 21 2012 Ivan Afonichev <ivan.afonichev at gmail.com> 0:7.0.25-1
- Updated to 7.0.25
- Removed EntityResolver patch (changes already in upstream sources)
More information about the scm-commits
mailing list