[jspc] changes required for xmvn 2.0

Peter MacKinnon pmackinn at fedoraproject.org
Mon Jun 9 21:19:55 UTC 2014


commit cba8c97081f6a161ce6f09054a1bb6dec9dc0608
Author: Peter MacKinnon <pmackinn at redhat.com>
Date:   Mon Jun 9 21:19:31 2014 +0000

    changes required for xmvn 2.0

 jspc.spec |   47 ++++++++---------------------------------------
 1 files changed, 8 insertions(+), 39 deletions(-)
---
diff --git a/jspc.spec b/jspc.spec
index 86b5d24..19c3114 100644
--- a/jspc.spec
+++ b/jspc.spec
@@ -4,7 +4,7 @@
 
 Name:          jspc
 Version:       2.0
-Release:       0.12%{dotreltag}%{?dist}
+Release:       0.13%{dotreltag}%{?dist}
 Summary:       Compile JSPs under Maven
 Group:         Development/Libraries
 License:       ASL 2.0
@@ -152,50 +152,19 @@ cp %{SOURCE1} META-INF/maven/plugin.xml
 jar uf  %{name}-maven-plugin/target/%{name}-maven-plugin-2.0-alpha-3.jar META-INF/maven/plugin.xml
 
 %install
+%mvn_install
 
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}.pom
-%add_maven_depmap JPP.%{name}-%{name}.pom
-
-mkdir -p %{buildroot}%{_javadir}/%{name}
-
-install -m 644 %{name}-compiler-api/target/%{name}-compiler-api-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/%{name}-compiler-api.jar
-install -pm 644 %{name}-compiler-api/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-compiler-api.pom
-%add_maven_depmap JPP.%{name}-%{name}-compiler-api.pom %{name}/%{name}-compiler-api.jar
-
-install -pm 644 %{name}-compilers/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-compilers.pom
-%add_maven_depmap JPP.%{name}-%{name}-compilers.pom
-
-install -m 644 %{name}-compilers/%{name}-compiler-tomcat6/target/%{name}-compiler-tomcat6-%{namedversion}.jar \
-  %{buildroot}%{_javadir}/%{name}/%{name}-compiler-tomcat6.jar
-install -pm 644 %{name}-compilers/%{name}-compiler-tomcat6/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-compiler-tomcat6.pom
-%add_maven_depmap JPP.%{name}-%{name}-compiler-tomcat6.pom %{name}/%{name}-compiler-tomcat6.jar
-
-install -m 644 %{name}-maven-plugin/target/%{name}-maven-plugin-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/%{name}-maven-plugin.jar
-install -pm 644 %{name}-maven-plugin/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-maven-plugin.pom
-%add_maven_depmap JPP.%{name}-%{name}-maven-plugin.pom %{name}/%{name}-maven-plugin.jar
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
-%dir %{_javadir}/%{name}
-%{_javadir}/%{name}/%{name}-compiler-api.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}.pom
-%{_mavenpomdir}/JPP.%{name}-%{name}-compiler-api.pom
-%{_mavenpomdir}/JPP.%{name}-%{name}-compilers.pom
-%{_javadir}/%{name}/%{name}-compiler-tomcat6.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-compiler-tomcat6.pom
-%{_javadir}/%{name}/%{name}-maven-plugin.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-maven-plugin.pom
-%{_mavendepmapfragdir}/%{name}
+%files -f .mfiles
+%{_javadir}/%{name}
 %doc LICENSE.txt
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE.txt
 
 %changelog
+* Mon Jun 09 2014 Peter MacKinnon <pmackinn at redhat.com> 2.0-0.13.alpha.3
+- changes required for xmvn 2.0
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-0.12.alpha.3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list