[jboss-jaxr-1.0-api] switch to XMvn

gil gil at fedoraproject.org
Tue Jul 9 09:58:05 UTC 2013


commit b97e35c8631e87bf7c92a10247e356d48bc2bdc6
Author: gil <puntogil at libero.it>
Date:   Tue Jul 9 11:57:52 2013 +0200

    switch to XMvn

 jboss-jaxr-1.0-api-1.0.2.Final-pom.patch |   18 ----------
 jboss-jaxr-1.0-api.spec                  |   54 ++++++++---------------------
 2 files changed, 15 insertions(+), 57 deletions(-)
---
diff --git a/jboss-jaxr-1.0-api.spec b/jboss-jaxr-1.0-api.spec
index 5534008..dac74d8 100644
--- a/jboss-jaxr-1.0-api.spec
+++ b/jboss-jaxr-1.0-api.spec
@@ -1,81 +1,58 @@
 %global namedreltag .Final
 %global namedversion %{version}%{?namedreltag}
+%global oname jboss-jaxr-api_1.0_spec
 Name:          jboss-jaxr-1.0-api
 Version:       1.0.2
-Release:       4%{?dist}
-Summary:       Java(TM) API for XML Registries 1.0 (JAXR)
-Group:         Development/Libraries
+Release:       5%{?dist}
+Summary:       Java API for XML Registries 1.0 (JAXR)
 License:       CDDL or GPLv2 with exceptions
 URL:           http://www.jboss.org/
 # git clone git://github.com/jboss/jboss-jaxr-api_spec.git jboss-jaxr-1.0-api
 # cd jboss-jaxr-1.0-api/ && git archive --format=tar --prefix=jboss-jaxr-1.0-api/ jboss-jaxr-api_1.0_spec-1.0.2.Final  | xz > jboss-jaxr-1.0-api-1.0.2.Final.tar.xz
 Source0:       %{name}-%{namedversion}.tar.xz
 
-# remove javax.activation
-Patch0:        %{name}-%{namedversion}-pom.patch
-
 BuildRequires: java-devel
 BuildRequires: jboss-specs-parent
-BuildRequires: jpackage-utils
 
 BuildRequires: maven-local
-BuildRequires: maven-compiler-plugin
 BuildRequires: maven-enforcer-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
 BuildRequires: maven-plugin-bundle
-BuildRequires: maven-resources-plugin
 BuildRequires: maven-source-plugin
-BuildRequires: maven-surefire-plugin
 
-Requires:      java
-Requires:      jpackage-utils
 BuildArch:     noarch
 
 %description
-JSR 93: Java(TM) API for XML Registries 1.0 (JAXR).
+JSR 93: Java API for XML Registries 1.0 (JAXR).
 
 %package javadoc
-Group:         Documentation
 Summary:       Javadoc for %{name}
-Requires:      jpackage-utils
 
 %description javadoc
 This package contains javadoc for %{name}.
 
 %prep
 %setup -q -n %{name}
-%patch0 -p0
+%pom_remove_dep javax.activation:activation
 
 %build
 
-mvn-rpmbuild install javadoc:aggregate
+%mvn_file :%{oname} %{name}
+%mvn_build
 
 %install
+%mvn_install
 
-mkdir -p %{buildroot}%{_javadir}
-install -m 644 target/jboss-jaxr-api_1.0_spec-%{namedversion}.jar \
-  %{buildroot}%{_javadir}/%{name}.jar
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
+%files -f .mfiles
 %doc LICENSE README
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE
 
 %changelog
+* Tue Jul 09 2013 gil cattaneo <puntogil at libero.it> 1.0.2-5
+- switch to XMvn
+- minor changes to adapt to current guideline
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
@@ -87,5 +64,4 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
 * Tue Apr 24 2012 gil cattaneo <puntogil at libero.it> 1.0.2-1
-- initial rpm
-
+- initial rpm
\ No newline at end of file


More information about the scm-commits mailing list