[jboss-vfs/f17] - Upstream release 3.1.0.Final - Relocated jars to _javadir

[Marek Goldmann]

commit 3402008074a5d87945c99648e8a3466852211da3
Author: Marek Goldmann <goldmann at fedoraproject.org>
Date:   Fri Mar 9 17:58:39 2012 +0100

    - Upstream release 3.1.0.Final
    - Relocated jars to _javadir

 .gitignore                                         |    1 +
 ...R1-pom.patch => jboss-vfs-3.1.0.Final-pom.patch |    0
 jboss-vfs.spec                                     |   24 +++++++++++--------
 sources                                            |    2 +-
 4 files changed, 16 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9b2f549..cd50435 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /jboss-vfs-3.0.1.GA-CLEAN.tar.xz
 /jboss-vfs-3.1.0.CR1-CLEAN.tar.xz
+/jboss-vfs-3.1.0.Final-CLEAN.tar.xz
diff --git a/jboss-vfs-3.1.0.CR1-pom.patch b/jboss-vfs-3.1.0.Final-pom.patch
similarity index 100%
rename from jboss-vfs-3.1.0.CR1-pom.patch
rename to jboss-vfs-3.1.0.Final-pom.patch
diff --git a/jboss-vfs.spec b/jboss-vfs.spec
index 9212849..0dfd45e 100644
--- a/jboss-vfs.spec
+++ b/jboss-vfs.spec
@@ -1,9 +1,9 @@
-%global namedreltag .CR1
+%global namedreltag .Final
 %global namedversion %{version}%{?namedreltag}
 
 Name:             jboss-vfs
 Version:          3.1.0
-Release:          0.2%{namedreltag}%{?dist}
+Release:          1%{?dist}
 Summary:          JBoss Virtual File System
 Group:            Development/Libraries
 License:          LGPLv2+
@@ -12,9 +12,9 @@ URL:              https://github.com/jbossas/jboss-vfs/
 # Microsoft JDBC driver needs to be removed
 #
 # git clone git://github.com/jbossas/jboss-vfs.git
-# cd jboss-vfs && git checkout 3.1.0.CR1 && git checkout-index -f -a --prefix=jboss-vfs-3.1.0.CR1/
-# rm jboss-vfs-3.1.0.CR1/src/test/resources/vfs/test/zipeinit.jar
-# tar -cJf jboss-vfs-3.1.0.CR1-CLEAN.tar.xz jboss-vfs-3.1.0.CR1
+# cd jboss-vfs && git checkout 3.1.0.Final && git checkout-index -f -a --prefix=jboss-vfs-3.1.0.Final/
+# rm jboss-vfs-3.1.0.Final/src/test/resources/vfs/test/zipeinit.jar
+# tar -cJf jboss-vfs-3.1.0.Final-CLEAN.tar.xz jboss-vfs-3.1.0.Final
 Source0:          %{name}-%{namedversion}-CLEAN.tar.xz
 Patch0:           %{name}-%{namedversion}-pom.patch
 
@@ -61,18 +61,18 @@ rm -rf .classpath archives/ .project
 mvn-rpmbuild install -Dmaven.test.skip=true 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/%{name}-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/jboss/%{name}.jar
+install -pm 644 target/%{name}-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # POM
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.jboss-%{name}.pom
-%add_maven_depmap JPP.jboss-%{name}.pom jboss/%{name}.jar
+install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%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}
 
 %files
@@ -84,6 +84,10 @@ cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}
 
 %changelog
+* Fri Mar 09 2012 Marek Goldmann <mgoldman at redhat.com> 3.1.0-1
+- Upstream release 3.1.0.Final
+- Relocated jars to _javadir
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.0-0.2.CR1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 9be6e45..bf7317c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-151147a4fcc30340dcf7cb3f299bf5f1  jboss-vfs-3.1.0.CR1-CLEAN.tar.xz
+425682c4fd6cb354bde774fc07d2884f  jboss-vfs-3.1.0.Final-CLEAN.tar.xz