[glassfish-jsp-api] Drop manual requires

Michael Šimáček msimacek at fedoraproject.org
Fri Mar 14 09:54:11 UTC 2014


commit 374cd0c2da29150c67285549bb26ee9bf25b9d2f
Author: Michael Simacek <msimacek at redhat.com>
Date:   Thu Mar 13 15:00:12 2014 +0100

    Drop manual requires

 glassfish-jsp-api.spec |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/glassfish-jsp-api.spec b/glassfish-jsp-api.spec
index e124e0f..f00ed2b 100644
--- a/glassfish-jsp-api.spec
+++ b/glassfish-jsp-api.spec
@@ -4,7 +4,7 @@
 
 Name:       glassfish-jsp-api
 Version:    2.3.1
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    Glassfish J2EE JSP API specification
 
 License:    (CDDL or GPLv2 with exceptions) and ASL 2.0
@@ -25,9 +25,6 @@ BuildRequires:  jvnet-parent
 BuildRequires:  mvn(javax.servlet:javax.servlet-api)
 BuildRequires:  mvn(javax.el:javax.el-api)
 
-Requires:       mvn(javax.servlet:javax.servlet-api)
-Requires:       mvn(javax.el:javax.el-api)
-
 %description
 This project provides a container independent specification of JSP
 2.2. Note that this package doesn't contain implementation of this
@@ -35,7 +32,6 @@ specification. See glassfish-jsp for one of implementations
 
 %package javadoc
 Summary:        API documentation for %{name}
-Requires:       jpackage-utils >= 0:1.7.5
 BuildArch:      noarch
 
 %description javadoc
@@ -49,6 +45,8 @@ cp -p %{SOURCE3} cddllicense.txt
 # Submited upstream: http://java.net/jira/browse/JSP-31
 sed -i "/<bundle.symbolicName>/s/-api//" pom.xml
 
+%pom_xpath_remove "pom:dependency[pom:groupId='javax.el' or pom:groupId='javax.servlet']/pom:scope"
+
 %build
 %mvn_build
 
@@ -63,6 +61,9 @@ sed -i "/<bundle.symbolicName>/s/-api//" pom.xml
 
 
 %changelog
+* Thu Mar 13 2014 Michael Simacek <msimacek at redhat.com> - 2.3.1-3
+- Drop manual requires
+
 * Tue Feb 25 2014 Alexander Kurtakov <akurtako at redhat.com> 2.3.1-2
 - Do not require jvnet-parent.
 


More information about the scm-commits mailing list