From 1c1e8709ec66d6b28c8e8d15bf85b379db31c625 Mon Sep 17 00:00:00 2001 From: Marek Goldmann Date: Nov 17 2011 15:10:39 +0000 Subject: Upstream release 3.0.0.CR3 --- diff --git a/.gitignore b/.gitignore index a9ec9ae..06022c2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /xnio-3.0.0.Beta4.tar.xz /xnio-3.0.0.Beta6.tar.xz +/xnio-3.0.0.CR3.tar.xz diff --git a/sources b/sources index 859a665..c2d885d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7bb84c1a096bc043250900a5df99a62d xnio-3.0.0.Beta6.tar.xz +f1a23f23d66cbbe14455633711ddca91 xnio-3.0.0.CR3.tar.xz diff --git a/xnio-3.0.0.CR3-jmock.patch b/xnio-3.0.0.CR3-jmock.patch new file mode 100644 index 0000000..c2c57f8 --- /dev/null +++ b/xnio-3.0.0.CR3-jmock.patch @@ -0,0 +1,40 @@ +diff -Naur xnio-3.0.0.CR3/api/pom.xml xnio-3.0.0.CR3-work/api/pom.xml +--- xnio-3.0.0.CR3/api/pom.xml 2011-11-11 16:20:03.000000000 -0500 ++++ xnio-3.0.0.CR3-work/api/pom.xml 2011-11-17 10:03:41.133137228 -0500 +@@ -57,16 +57,6 @@ + junit + test + +- +- org.jmock +- jmock +- test +- +- +- org.jmock +- jmock-junit4 +- test +- + + + +diff -Naur xnio-3.0.0.CR3/pom.xml xnio-3.0.0.CR3-work/pom.xml +--- xnio-3.0.0.CR3/pom.xml 2011-11-11 16:20:03.000000000 -0500 ++++ xnio-3.0.0.CR3-work/pom.xml 2011-11-17 09:59:25.114989195 -0500 +@@ -67,16 +67,6 @@ + 3.1.0.Beta3 + + +- org.jmock +- jmock +- 2.5.1 +- +- +- org.jmock +- jmock-junit4 +- 2.5.1 +- +- + org.jboss.logmanager + jboss-logmanager + 1.2.0.GA diff --git a/xnio.spec b/xnio.spec index ccaf8f6..7e345cf 100644 --- a/xnio.spec +++ b/xnio.spec @@ -1,4 +1,4 @@ -%global namedreltag .Beta6 +%global namedreltag .CR3 %global namedversion %{version}%{?namedreltag} Name: xnio @@ -10,8 +10,9 @@ License: LGPLv2+ URL: http://www.jboss.org/xnio # git clone git://github.com/jboss-remoting/xnio.git -# cd xnio/ && git archive --format=tar --prefix=xnio-3.0.0.Beta6/ 3.0.0.Beta6 | xz > xnio-3.0.0.Beta6.tar.xz +# cd xnio/ && git archive --format=tar --prefix=xnio-3.0.0.CR3/ 3.0.0.CR3 | xz > xnio-3.0.0.CR3.tar.xz Source0: %{name}-%{namedversion}.tar.xz +Patch00: %{name}-%{namedversion}-jmock.patch BuildArch: noarch @@ -53,9 +54,10 @@ This package contains the API documentation for %{name}. %prep %setup -q -n %{name}-%{namedversion} +%patch0 -p1 %build -mvn-rpmbuild install javadoc:aggregate +mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate %install # JAR @@ -89,6 +91,9 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.jboss-%{name}.pom %doc COPYING.txt %changelog +* Thu Nov 17 2011 Marek Goldmann 3.0.0-0.1.CR3 +- Upstream release 3.0.0.CR3 + * Fri Oct 07 2011 Marek Goldmann 3.0.0-0.1.Beta6 - Upstream release 3.0.0.Beta6