[staxmapper/f17] Relocated jars to _javadir

Marek Goldmann goldmann at fedoraproject.org
Thu Feb 23 19:52:59 UTC 2012


commit d7c6b0ab2de64612f116436d2876fd2036f9728e
Author: Marek Goldmann <goldmann at fedoraproject.org>
Date:   Thu Feb 23 20:52:40 2012 +0100

    Relocated jars to _javadir

 staxmapper.spec |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/staxmapper.spec b/staxmapper.spec
index 7fc3bbd..30edc71 100644
--- a/staxmapper.spec
+++ b/staxmapper.spec
@@ -3,7 +3,7 @@
 
 Name:             staxmapper
 Version:          1.1.0
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          StAX Mapper
 Group:            Development/Libraries
 License:          LGPLv2+
@@ -45,8 +45,8 @@ mvn-rpmbuild install javadoc:aggregate
 
 %install
 # JAR
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/jboss
-cp -p target/%{name}-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/jboss/%{name}.jar
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+cp -p target/%{name}-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # APIDOCS
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -54,10 +54,10 @@ cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 # POM
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.jboss-%{name}.pom
+install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 
 # DEPMAP
-%add_maven_depmap JPP.jboss-%{name}.pom jboss/%{name}.jar
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 %files
 %{_mavenpomdir}/*
@@ -68,6 +68,9 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.jboss-%{name}.pom
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Feb 23 2012 Marek Goldmann <mgoldman at redhat.com> 1.1.0-2
+- Relocated jars to _javadir
+
 * Thu Feb 16 2012 Marek Goldmann <mgoldman at redhat.com> 1.1.0-1
 - Upstream release 1.1.0.Final
 


More information about the scm-commits mailing list