[hornetq] Upstream release 2.3.1.Final
Marek Goldmann
goldmann at fedoraproject.org
Mon Jul 22 13:48:55 UTC 2013
commit 72cd2dfe0285be914d7cbf91556fadaa4c768465
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date: Mon Jul 22 15:48:38 2013 +0200
Upstream release 2.3.1.Final
.gitignore | 1 +
...en-buildmagic-thirdparty-plugin-dependenc.patch | 55 ------
0002-Removed-spring-dependency.patch | 44 -----
0003-gui-aid-changes.patch | 76 --------
0004-JDK7-fix-for-FileChannel-constructor.patch | 33 ----
0005-Libraries-paths.patch | 115 ------------
0006-Make-creation-of-pom-files-easier.patch | 63 -------
...depend-dependency-to-run-javadoc-creation.patch | 33 ----
0008-Native-build-fixes.patch | 37 ----
hornetq.spec | 187 ++++++++------------
sources | 2 +-
11 files changed, 76 insertions(+), 570 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 322feab..b986440 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/hornetq-2.2.13-CLEAN.tar.xz
+/HornetQ_2_3_1_FINAL.tar.gz
diff --git a/hornetq.spec b/hornetq.spec
index 730dd2d..10452d9 100644
--- a/hornetq.spec
+++ b/hornetq.spec
@@ -1,32 +1,18 @@
+%global namedreltag .Final
+%global namedversion %{version}%{?namedreltag}
+%global customnamedversion 2_3_1_FINAL
+
Name: hornetq
-Version: 2.2.13
-Release: 6%{?dist}
+Version: 2.3.1
+Release: 1%{?dist}
Summary: High performance messaging system
-Group: Development/Libraries
License: ASL 2.0
URL: http://www.jboss.org/hornetq
-
-# git clone git://github.com/hornetq/hornetq.git
-# cd hornetq && git checkout HornetQ_2_2_13_AS7_Final && git checkout-index -f -a --prefix=hornetq-2.2.13/
-# find hornetq-2.2.13/ -name '*.jar' -delete
-# tar cafJ hornetq-2.2.13-CLEAN.tar.xz hornetq-2.2.13
-Source0: hornetq-%{version}-CLEAN.tar.xz
-
-Patch0: 0001-Removed-maven-buildmagic-thirdparty-plugin-dependenc.patch
-Patch1: 0002-Removed-spring-dependency.patch
-Patch2: 0003-gui-aid-changes.patch
-Patch3: 0004-JDK7-fix-for-FileChannel-constructor.patch
-Patch4: 0005-Libraries-paths.patch
-Patch5: 0006-Make-creation-of-pom-files-easier.patch
-Patch6: 0007-Add-jdepend-dependency-to-run-javadoc-creation.patch
-Patch7: 0008-Native-build-fixes.patch
-
-BuildRequires: jpackage-utils
-BuildRequires: java-devel
-BuildRequires: ant
+Source0: https://github.com/hornetq/hornetq/archive/HornetQ_2_3_1_FINAL.tar.gz
BuildRequires: automake libtool autoconf
BuildRequires: apiviz
+BuildRequires: aether
BuildRequires: apache-commons-logging
BuildRequires: javacc
BuildRequires: jboss-connector-1.6-api
@@ -34,33 +20,27 @@ BuildRequires: jboss-ejb-3.1-api
BuildRequires: jboss-ejb3-ext-api
BuildRequires: jboss-jaspi-1.0-api
BuildRequires: jboss-jms-1.1-api
-BuildRequires: jboss-jts
BuildRequires: jboss-logging
BuildRequires: jboss-servlet-3.0-api
BuildRequires: jboss-transaction-1.1-api
BuildRequires: jboss-transaction-spi
BuildRequires: jboss-logging
+BuildRequires: jboss-logging-tools
+BuildRequires: jboss-remoting
+BuildRequires: jboss-naming
+BuildRequires: jbossws-parent
BuildRequires: jdepend
BuildRequires: libaio-devel
BuildRequires: netty
+BuildRequires: maven-local
+BuildRequires: javacc-maven-plugin
+BuildRequires: java-service-wrapper
+BuildRequires: jgroups
+BuildRequires: jboss-integration
-Requires: jpackage-utils
-Requires: java
-
-Requires: apache-commons-logging
-Requires: jboss-connector-1.6-api
-Requires: jboss-ejb-3.1-api
-Requires: jboss-ejb3-ext-api
-Requires: jboss-jaspi-1.0-api
-Requires: jboss-jms-1.1-api
-Requires: jboss-jts
-Requires: jboss-logging
-Requires: jboss-servlet-3.0-api
-Requires: jboss-transaction-1.1-api
-Requires: jboss-transaction-spi
-Requires: jboss-logging
-Requires: jdepend
-Requires: netty
+# Remove after rebuild with narayana
+BuildRequires: jboss-jts
+#BuildRequires: narayana
%description
HornetQ is an open source project to build a multi-protocol, embeddable,
@@ -68,110 +48,91 @@ very high performance, clustered, asynchronous messaging system.
%package javadoc
Summary: Javadocs for %{name}
-Group: Documentation
-Requires: jpackage-utils
%description javadoc
This package contains the API documentation for %{name}.
-%package devel
-Summary: Native development files for %{name}
-Group: Development/Libraries
-Requires: %{name}%{?_isa} = %{version}-%{release}
+%prep
+%setup -q -n hornetq-HornetQ_%{customnamedversion}
-%description devel
-This package provides the support files which can be used to
-build applications using the HornetQ native library.
+# Remove bundled .so files
+find -name "*.so" -delete
-%prep
-%setup -q -n hornetq-%{version}
+# Uncomment after rebuild with narayana
+#%pom_remove_dep "org.jboss.jbossts:jbossjts" hornetq-jms-server/pom.xml
+#%pom_add_dep "org.jboss.narayana.jta:jta" hornetq-jms-server/pom.xml
+%pom_disable_module hornetq-server
+%pom_disable_module hornetq-jms-server
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
+%pom_disable_module hornetq-bootstrap
+%pom_disable_module hornetq-ra
+%pom_disable_module hornetq-rest
+%pom_disable_module hornetq-service-sar
+%pom_disable_module tests
-mkdir -p thirdparty/net/java/dev/javacc/lib/ thirdparty/org/jboss/apiviz/lib/
+#DEBUG: Caused by: org.apache.maven.project.DependencyResolutionException: Could not resolve dependencies for project org.hornetq:hornetq-jboss-as-integration:jar:2.3.1.Final: The following artifacts could not be resolved: org.jboss.security:jboss-security-spi:jar:2.0.3.SP1, org.jboss.security:jbosssx:jar:2.0.3.SP1, org.jboss.jbossts:jbossjts:jar:4.16.4.Final: The repository system is offline but the artifact org.jboss.security:jboss-security-spi:jar:2.0.3.SP1 is not available in the local repository.
+%pom_disable_module integration/hornetq-jboss-as-integration
+%pom_disable_module integration/hornetq-spring-integration
+%pom_disable_module integration/hornetq-twitter-integration
-ln -s $(build-classpath javacc) thirdparty/net/java/dev/javacc/lib/javacc.jar
-ln -s $(build-classpath apiviz) thirdparty/org/jboss/apiviz/lib/apiviz.jar
-ln -s $(build-classpath jdepend) thirdparty/org/jboss/apiviz/lib/jdepend.jar
+%pom_remove_dep "org.jboss.microcontainer:jboss-kernel"
-%build
-# Build jars and javadocs
-ant -Dnodownload=true -Dhornetq.run_script=true jar-core jar-core-client jar-jms jar-jms-client jar-ra javadoc
-# Create POMs
-ant -f build-maven.xml deploy
+%build
+# Prebuild the classes, so we can create new native bits later
+xmvn -B -o compile
# Build native bits
export JAVA_HOME=/usr/lib/jvm/java
-pushd native
+pushd hornetq-native
+autoreconf --install
+%configure
+make clean
+
# Generate C headers
pushd src
-javah -classpath ../../build/jars/hornetq-core.jar org.hornetq.core.asyncio.impl.AsynchronousFileImpl
+javah -classpath $(build-classpath jboss-logging/jboss-logging):../../hornetq-journal/target/classes org.hornetq.core.asyncio.impl.AsynchronousFileImpl
popd
-autoreconf --install
-%configure
make %{?_smp_mflags}
-popd
-
-%install
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-for m in core-client core jms-client jms ra; do
- # JAR
- install -pm 644 build/jars/hornetq-${m}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-${m}.jar
-
- # POM
- install -pm 644 hornetq-${m}.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}-${m}.pom
-
- # DEPMAP
- %add_maven_depmap JPP.%{name}-%{name}-${m}.pom %{name}/%{name}-${m}.jar
-done
-
-# APIDOCS
-cp -rp build/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-# Install native bits
-pushd native
-make install DESTDIR=$RPM_BUILD_ROOT
+%ifarch x86_64
+cp -L src/.libs/libHornetQAIO.so bin/libHornetQAIO64.so
+%else
+cp -L src/.libs/libHornetQAIO.so bin/libHornetQAIO32.so
+%endif
popd
-# Remove static files
-rm $RPM_BUILD_ROOT/%{_libdir}/*.la
+# Skipping test because junit 3 is not available and 4 breaks the test suite
+%mvn_build -- -P maven-release
-# Rename the executable file by prefixing it
-mv $RPM_BUILD_ROOT/%{_bindir}/disktest $RPM_BUILD_ROOT/%{_bindir}/%{name}-disktest
+%install
+%mvn_install
+
+# Install native stuff
+install -d -m 755 %{buildroot}/%{_libdir}
+cp -L hornetq-native/src/.libs/libHornetQAIO.so %{buildroot}/%{_libdir}/libHornetQAIO.so
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
-%{_libdir}/libHornetQAIO.so.*
-%{_bindir}/%{name}-disktest
-%doc licenses/LICENSE.txt
-
-%files javadoc
-%{_javadocdir}/%{name}
-%doc licenses/LICENSE.txt
-
-%files devel
+%files -f .mfiles
+%dir %{_javadir}/%{name}
%{_libdir}/libHornetQAIO.so
-%doc licenses/LICENSE.txt
+%doc distribution/hornetq/src/main/resources/licenses/LICENSE.txt
+%doc NOTICE
+%doc README.md
+
+%files javadoc -f .mfiles-javadoc
+%doc distribution/hornetq/src/main/resources/licenses/LICENSE.txt
+%doc NOTICE
%changelog
+* Wed Jun 12 2013 Marek Goldmann <mgoldman at redhat.com> - 2.3.1-1
+- Upstream release 2.3.1.Final
+- New guidelines
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.13-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index ad267d5..0199d99 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5581dddb5356d6ee467ffe4018a21f0c hornetq-2.2.13-CLEAN.tar.xz
+f4fdd4f90021e1d4d209f550c81bae3c HornetQ_2_3_1_FINAL.tar.gz
More information about the scm-commits
mailing list