[glassfish-el-api] fix rhbz#992386, switch to XMvn

Alexander Kurtakov akurtakov at fedoraproject.org
Mon Aug 12 13:15:36 UTC 2013


commit b220e7f03ee638d02b57fd8d78116aa1d05649a4
Author: gil <puntogil at libero.it>
Date:   Thu Aug 8 04:58:10 2013 +0200

    fix rhbz#992386, switch to XMvn

 glassfish-el-api.spec |   38 ++++++++++++--------------------------
 1 files changed, 12 insertions(+), 26 deletions(-)
---
diff --git a/glassfish-el-api.spec b/glassfish-el-api.spec
index 2326a9d..b1a7d9e 100644
--- a/glassfish-el-api.spec
+++ b/glassfish-el-api.spec
@@ -2,10 +2,8 @@
 
 Name:           glassfish-el-api
 Version:        2.2.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Expression Language API 2.2.4
-
-Group:          Development/Libraries
 # Part of implementation files contain ASL 2.0 copyright
 License:        CDDL and ASL 2.0
 URL:            http://uel.java.net
@@ -16,12 +14,10 @@ Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
 BuildArch:      noarch
 
 BuildRequires:  java-devel >= 1:1.6.0
-BuildRequires:  jpackage-utils
+
 BuildRequires:  jvnet-parent
 BuildRequires:  maven-local
-BuildRequires:  maven
 BuildRequires:  maven-source-plugin
-Requires:      java
 
 %description
 This project provides an implementation of the Expression Language (EL). 
@@ -30,7 +26,6 @@ The main goals are:
  * Provides API for use by other tools, such as Netbeans
 
 %package javadoc
-Group:          Documentation
 Summary:        Javadoc for %{name}
 
 %description javadoc
@@ -41,34 +36,25 @@ API documentation for %{name}.
 cp -p %{SOURCE1} .
 
 %build
-mvn-rpmbuild install javadoc:javadoc
-
-%install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{artifactId}-%{version}.jar \
-    %{buildroot}%{_javadir}/%{name}.jar
 
-# poms
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml \
-    %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%mvn_file :%{artifactId} %{name}
+%mvn_build
 
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-# javadoc
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-rm -rf target/site/api*
+%install
+%mvn_install
 
 %files -f .mfiles
 %doc LICENSE-2.0.txt
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE-2.0.txt
-%{_javadocdir}/%{name}
 
 %changelog
+* Thu Aug 08 2013 gil cattaneo <puntogil at libero.it> 2.2.4-3
+- fix rhbz#992386
+- switch to XMvn
+- minor changes to adapt to current guideline
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list