[jandex/f17] Relocated jars to _javadir

Marek Goldmann goldmann at fedoraproject.org
Fri Mar 9 15:38:35 UTC 2012


commit 987728bdbdd75185d3b64fc912d5b358f3ac42ab
Author: Marek Goldmann <goldmann at fedoraproject.org>
Date:   Fri Mar 9 16:36:53 2012 +0100

    Relocated jars to _javadir

 jandex.spec |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/jandex.spec b/jandex.spec
index 35d8bed..2f9e5fc 100644
--- a/jandex.spec
+++ b/jandex.spec
@@ -3,7 +3,7 @@
 
 Name:             jandex
 Version:          1.0.3
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          Java Annotation Indexer
 Group:            Development/Libraries
 License:          LGPLv2+
@@ -50,27 +50,29 @@ This package contains the API documentation for %{name}.
 mvn-rpmbuild install javadoc:aggregate
 
 %install
-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
 
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 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
 
-%add_maven_depmap JPP.jboss-%{name}.pom jboss/%{name}.jar
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 %files
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 %{_javadir}/*
-%doc
 
 %files javadoc
 %{_javadocdir}/%{name}
 
 %changelog
+* Fri Mar 09 2012 Marek Goldmann <mgoldman at redhat.com> 1.0.3-3
+- Relocated jars to _javadir
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list