[jboss-dmr/f17] Relocated jars to _javadir

Marek Goldmann goldmann at fedoraproject.org
Fri Mar 9 17:31:17 UTC 2012


commit 36de0f949a8fe0147805a43fd7bc5368167de7a7
Author: Marek Goldmann <goldmann at fedoraproject.org>
Date:   Fri Mar 9 18:30:52 2012 +0100

    Relocated jars to _javadir

 jboss-dmr.spec |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/jboss-dmr.spec b/jboss-dmr.spec
index c84a52c..7971c50 100644
--- a/jboss-dmr.spec
+++ b/jboss-dmr.spec
@@ -3,7 +3,7 @@
 
 Name:             jboss-dmr
 Version:          1.1.1
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          JBoss DMR
 Group:            Development/Libraries
 License:          LGPLv2+
@@ -63,8 +63,8 @@ mvn-rpmbuild -Dmaven.test.skip=true 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}
@@ -72,10 +72,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}/*
@@ -86,6 +86,9 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.jboss-%{name}.pom
 %{_javadocdir}/%{name}
 
 %changelog
+* Fri Mar 09 2012 Marek Goldmann <mgoldman at redhat.com> 1.1.1-3
+- Relocated jars to _javadir
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list