[jboss-vfs] - Upstream release 3.2.0.Beta1 - New guidelines

Marek Goldmann goldmann at fedoraproject.org
Tue Jun 4 11:59:06 UTC 2013


commit 9a0df500d17031c7c30800e00b8d6560c71c6759
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Tue Jun 4 13:58:45 2013 +0200

    - Upstream release 3.2.0.Beta1
    - New guidelines

 .gitignore     |    1 +
 jboss-vfs.spec |   61 ++++++++++++++-----------------------------------------
 sources        |    2 +-
 3 files changed, 18 insertions(+), 46 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cd50435..e212cc8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /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
+/3.2.0.Beta1.tar.gz
diff --git a/jboss-vfs.spec b/jboss-vfs.spec
index 29540bc..dad7dd5 100644
--- a/jboss-vfs.spec
+++ b/jboss-vfs.spec
@@ -1,27 +1,16 @@
-%global namedreltag .Final
+%global namedreltag .Beta1
 %global namedversion %{version}%{?namedreltag}
 
 Name:             jboss-vfs
-Version:          3.1.0
-Release:          6%{?dist}
+Version:          3.2.0
+Release:          0.1%{namedreltag}%{?dist}
 Summary:          JBoss Virtual File System
-Group:            Development/Libraries
 License:          LGPLv2+
 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.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
+Source0:          https://github.com/jbossas/jboss-vfs/archive/%{namedversion}.tar.gz
 
 BuildArch:        noarch
 
-BuildRequires:    jpackage-utils
-BuildRequires:    java-devel
 BuildRequires:    maven-local
 BuildRequires:    maven-compiler-plugin
 BuildRequires:    maven-install-plugin
@@ -42,55 +31,37 @@ BuildRequires:    jboss-logging
 BuildRequires:    junit4
 BuildRequires:    jboss-parent
 
-Requires:         jboss-logging
-Requires:         jpackage-utils
-Requires:         java
-
 %description
 This package contains the JBoss Virtual File System.
 
 %package javadoc
 Summary:          Javadocs for %{name}
-Group:            Documentation
-Requires:         jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}-%{namedversion}
-%patch0 -p1
+%setup -q -n jboss-vfs-%{namedversion}
 
-rm -rf .classpath archives/ .project
+rm -rf src/test/resources/vfs/test/zipeinit.jar
 
 %build
-# Skipped because jboss-test is not packaged already
-mvn-rpmbuild install -Dmaven.test.skip=true javadoc:aggregate
+# Skipped because jboss-test is not packaged yet
+%mvn_build -f
 
 %install
-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}/%{name}.jar
+%mvn_install
 
-# POM
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%files -f .mfiles
+%dir %{_javadir}/%{name}
 
-# APIDOCS
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
-
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 
 %changelog
+* Tue Jun 04 2013 Marek Goldmann <mgoldman at redhat.com> - 3.2.0-0.1.Beta1
+- Upstream release 3.2.0.Beta1
+- New guidelines
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index bf7317c..cef34b6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-425682c4fd6cb354bde774fc07d2884f  jboss-vfs-3.1.0.Final-CLEAN.tar.xz
+17e2504ca0810c2998fecb4f4442eb69  3.2.0.Beta1.tar.gz


More information about the scm-commits mailing list