[jboss-msc] - Upstream release 1.2.0.Beta1 - New guidelines

[Marek Goldmann]

commit 1d1c9341dc52f715a00520c6522040232e896660
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Wed Jun 26 15:32:03 2013 +0200

    - Upstream release 1.2.0.Beta1
    - New guidelines

 .gitignore     |    1 +
 jboss-msc.spec |   69 +++++++++++++------------------------------------------
 sources        |    2 +-
 3 files changed, 19 insertions(+), 53 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 678f9cb..52e153f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /jboss-msc-1.0.1.GA.tar.xz
 /jboss-msc-1.0.2.GA.tar.xz
+/1.2.0.Beta1.tar.gz
diff --git a/jboss-msc.spec b/jboss-msc.spec
index 261ef83..1b5c768 100644
--- a/jboss-msc.spec
+++ b/jboss-msc.spec
@@ -1,33 +1,18 @@
-%global namedreltag .GA
+%global namedreltag .Beta1
 %global namedversion %{version}%{?namedreltag}
 
 Name:             jboss-msc
-Version:          1.0.2
-Release:          5%{?dist}
+Version:          1.2.0
+Release:          0.1%{namedreltag}%{?dist}
 Summary:          JBoss Modular Service Container
-Group:            Development/Libraries
 License:          LGPLv2+
 URL:              https://github.com/jbossas/jboss-msc
-
-# git clone git://github.com/jbossas/jboss-msc.git
-# cd jboss-msc && git archive --format=tar --prefix=jboss-msc-1.0.2.GA/ 1.0.2.GA | xz > jboss-msc-1.0.2.GA.tar.xz
-Source0:          %{name}-%{namedversion}.tar.xz
+Source0:          https://github.com/jbossas/jboss-msc/archive/%{namedversion}.tar.gz
 
 BuildArch:        noarch
 
-BuildRequires:    jpackage-utils
-BuildRequires:    java-devel
 BuildRequires:    maven-local
-
-BuildRequires:    maven-compiler-plugin
-BuildRequires:    maven-install-plugin
-BuildRequires:    maven-jar-plugin
-BuildRequires:    maven-javadoc-plugin
-BuildRequires:    maven-release-plugin
-BuildRequires:    maven-resources-plugin
-BuildRequires:    maven-surefire-plugin
 BuildRequires:    maven-surefire-provider-junit4
-BuildRequires:    maven-enforcer-plugin
 BuildRequires:    javassist
 BuildRequires:    jboss-parent
 BuildRequires:    junit4
@@ -40,57 +25,37 @@ BuildRequires:    maven-injection-plugin
 BuildRequires:    jboss-modules
 BuildRequires:    apiviz
 
-Requires:         jboss-logging-tools
-Requires:         jboss-vfs
-Requires:         jboss-logging
-Requires:         byteman
-Requires:         javassist
-Requires:         jpackage-utils
-Requires:         java
-
 %description
 This package contains the JBoss Modular Service Container.
 
 %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}
+%setup -q -n jboss-msc-%{namedversion}
+
+%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-surefire-plugin']/pom:executions/pom:execution[pom:id = 'rejected-execution-test']/pom:configuration/pom:argLine"
+%pom_xpath_inject "pom:build/pom:plugins/pom:plugin[pom:artifactId = 'maven-surefire-plugin']/pom:executions/pom:execution[pom:id = 'rejected-execution-test']/pom:configuration" "<argLine>-Xbootclasspath/a:$(build-classpath jboss-logmanager) -- -javaagent:$(build-classpath byteman/byteman)=boot:$(build-classpath byteman/byteman),script:\${project.build.testOutputDirectory}/org/jboss/msc/racecondition/RejectedExecutionTestCase.btm</argLine>"
 
 %build
-# Tests run: 682, Failures: 18, Errors: 0, Skipped: 0
-mvn-rpmbuild install -Dmaven.test.skip=true javadoc:aggregate
+%mvn_build
 
 %install
-# JAR
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-cp -p target/%{name}-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+%mvn_install
 
-# APIDOCS
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%files -f .mfiles
+%dir %{_javadir}/%{name}
 
-# POM
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-
-# DEPMAP
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
-
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 
 %changelog
+* Wed Jun 26 2013 Marek Goldmann <mgoldman at redhat.com> - 1.2.0-0.1.Beta1
+- Upstream release 1.2.0.Beta1
+- New guidelines
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 8ea8391..147eb2c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-31c692ac2d2040ca5af6b5d85f6655f1  jboss-msc-1.0.2.GA.tar.xz
+0cf6305627061ba6f9b1080d97c764b8  1.2.0.Beta1.tar.gz