[freemarker] - Adapt to tomcat6-el jar rename.
Alexander Kurtakov
akurtakov at fedoraproject.org
Mon Sep 13 09:05:25 UTC 2010
commit 652fa8319df61e271862dd3a60d9f936ec9b5c06
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Mon Sep 13 12:00:14 2010 +0300
- Adapt to tomcat6-el jar rename.
freemarker.spec | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/freemarker.spec b/freemarker.spec
index 472cd3f..527e720 100644
--- a/freemarker.spec
+++ b/freemarker.spec
@@ -9,7 +9,7 @@ echo "ERROR: Sources should not contain JAR files:" && echo "$F" && exit 1
Name: freemarker
Version: %{fm_ver}
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: A template engine
Group: Development/Libraries
@@ -50,7 +50,7 @@ BuildRequires: tomcat5-servlet-2.4-api >= 5.5
BuildRequires: tomcat6-servlet-2.5-api >= 6.0
BuildRequires: tomcat6-lib >= 6.0.16
BuildRequires: xalan-j2 >= 2.7.0
-BuildRequires: tomcat6-lib
+BuildRequires: tomcat6-el-2.1-api
Requires: java >= 1:1.6.0
Requires: jpackage-utils
@@ -123,7 +123,7 @@ find -type f \( -iname '*.jar' -o -iname '*.class' \) -exec rm -f '{}' \;
# The package javax.el isn't included in:
%{__ln_s} -f %{_javadir}/tomcat6-servlet-2.5-api.jar lib/servlet.jar
# so, el-api.jar is additionally used.
-%{__ln_s} -f %{_javadir}/tomcat6/el-api.jar lib/el-api.jar
+%{__ln_s} -f %{_javadir}/tomcat6-el-2.1-api.jar lib/el-api.jar
%{__ln_s} -f %{_javadir}/struts.jar lib/struts.jar
%{__ln_s} -f %{_javadir}/xalan-j2.jar lib/xalan.jar
@@ -163,6 +163,9 @@ dos2unix -k docs/docs/api/package-list
%{_javadocdir}/%{name}
%changelog
+* Mon Sep 13 2010 Alexander Kurtakov <akurtako at redhat.com> 2.3.13-10
+- Adapt to tomcat6-el jar rename.
+
* Mon Sep 13 2010 Alexander Kurtakov <akurtako at redhat.com> 2.3.13-9
- Add tomcat6-libs BR.
- Use global instead of define.
More information about the scm-commits
mailing list