[bean-validation-api/f17] Relocated jars to _javadir

Marek Goldmann goldmann at fedoraproject.org
Fri Mar 9 16:09:11 UTC 2012


commit 981002413668d92f9e1920c380611dbd19a1cb62
Author: Marek Goldmann <goldmann at fedoraproject.org>
Date:   Fri Mar 9 17:08:52 2012 +0100

    Relocated jars to _javadir

 bean-validation-api.spec |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/bean-validation-api.spec b/bean-validation-api.spec
index 39f6d09..8a39744 100644
--- a/bean-validation-api.spec
+++ b/bean-validation-api.spec
@@ -3,7 +3,7 @@
 
 Name:             bean-validation-api
 Version:          1.0.0
-Release:          3%{dist}
+Release:          4%{dist}
 Summary:          Bean Validation API
 Group:            Development/Libraries
 License:          ASL 2.0
@@ -45,24 +45,24 @@ This package contains the API documentation for %{name}.
 mvn-rpmbuild install javadoc:aggregate
 
 %install
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/jboss
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 # JAR
-install -pm 644 target/validation-api-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/jboss/%{name}.jar
+install -pm 644 target/validation-api-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # POM
-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
 
 # APIDOCS
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/ $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 %files
-%{_javadir}/jboss/%{name}.jar
+%{_javadir}/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 %doc license.txt
@@ -72,6 +72,9 @@ cp -rp target/site/apidocs/ $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %doc license.txt
 
 %changelog
+* Fri Mar 09 2012 Marek Goldmann <mgoldman at redhat.com> 1.0.0-4
+- Relocated jars to _javadir
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list