commit 806d0da2dfd6e3643fb1a410a8f80f27f450530b
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Fri Dec 7 15:16:34 2012 +0200
Adapt to current guidelines.
- Build against tomcat 7.
apache-commons-el.spec | 43 +++++++++++--------------------------------
1 files changed, 11 insertions(+), 32 deletions(-)
---
diff --git a/apache-commons-el.spec b/apache-commons-el.spec
index 64a1753..726e1f9 100644
--- a/apache-commons-el.spec
+++ b/apache-commons-el.spec
@@ -5,7 +5,7 @@
Name: apache-%{short_name}
Version: 1.0
-Release: 24%{?dist}
+Release: 25%{?dist}
Summary: The Apache Commons Extension Language
License: ASL 1.1
Group: Development/Libraries
@@ -16,20 +16,12 @@ Source1:
http://repo1.maven.org/maven2/%{short_name}/%{short_name}/%{vers
Patch0: %{short_name}-%{version}-license.patch
Patch1: %{short_name}-eclipse-manifest.patch
Patch2: %{short_name}-enum.patch
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
BuildRequires: jpackage-utils >= 0:1.6
BuildRequires: ant
-BuildRequires: tomcat6-jsp-2.1-api
-BuildRequires: tomcat6-servlet-2.5-api
+BuildRequires: tomcat-jsp-2.2-api
+BuildRequires: tomcat-servlet-3.0-api
BuildRequires: junit
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-
-# This should go away with F-17
-Provides: jakarta-%{short_name} = 0:%{version}-%{release}
-Obsoletes: jakarta-%{short_name} < 0:%{version}-%{release}
-
%description
An implementation of standard interfaces and abstract classes for
javax.servlet.jsp.el which is part of the JSP 2.0 specification.
@@ -59,8 +51,8 @@ find . -type f -name "*.jar" -exec rm -f {} \;
cat > build.properties <<EOBP
build.compiler=modern
junit.jar=$(build-classpath junit)
-servlet-api.jar=$(build-classpath tomcat6-servlet-2.5-api)
-jsp-api.jar=$(build-classpath tomcat6-jsp-2.1-api)
+servlet-api.jar=$(build-classpath tomcat-servlet-3.0-api)
+jsp-api.jar=$(build-classpath tomcat-jsp-2.2-api)
servletapi.build.notrequired=true
jspapi.build.notrequired=true
EOBP
@@ -75,8 +67,6 @@ export OPT_JAR_LIST=:
%install
-rm -rf $RPM_BUILD_ROOT
-
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -p -m 644 dist/%{short_name}.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
@@ -97,23 +87,10 @@ install -pD -T -m 644 %{SOURCE1}
%{buildroot}%{_mavenpomdir}/JPP-%{short_name}.p
%add_to_maven_depmap commons-el commons-el %{version} JPP %{short_name}
# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%files
-%defattr(-,root,root,-)
%doc LICENSE.txt STATUS.html
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{name}.jar
@@ -123,13 +100,15 @@ rm -rf $RPM_BUILD_ROOT
%{_mavendepmapfragdir}/%{name}
%files javadoc
-%defattr(-,root,root,-)
%doc LICENSE.txt
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
+* Fri Dec 7 2012 Alexander Kurtakov <akurtako(a)redhat.com> 1.0-25
+- Adapt to current guidelines.
+- Build against tomcat 7.
+
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.0-24
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild