[jboss-jts/f17] Removed HornetQ patches, we have it now in Fedora

[Marek Goldmann]

commit 6cfee32c86730151cdf8828ef140a3bfe7236855
Author: Marek Goldmann <goldmann at fedoraproject.org>
Date:   Tue Jun 19 09:49:24 2012 +0200

    Removed HornetQ patches, we have it now in Fedora

 jboss-jts-4.16.2.Final-hornetq.patch         | 1160 --------------------------
 jboss-jts-4.16.2.Final-integration-pom.patch |   16 -
 jboss-jts-4.16.2.Final-pom.patch             |   16 -
 jboss-jts.spec                               |   22 +-
 4 files changed, 7 insertions(+), 1207 deletions(-)
---
diff --git a/jboss-jts.spec b/jboss-jts.spec
index 2ee9cc4..7fe84ed 100644
--- a/jboss-jts.spec
+++ b/jboss-jts.spec
@@ -3,7 +3,7 @@
 
 Name: jboss-jts
 Version: 4.16.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Distributed Transaction Manager
 Group: Development/Libraries
 License: LGPLv2+
@@ -28,15 +28,6 @@ Patch1: %{name}-%{namedversion}-publican.patch
 # Removed ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/tools/stats/TxPerfGraph.java because we don't have orson packaged
 Patch2: %{name}-%{namedversion}-orson.patch
 
-# Removed ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/hornetq/* classes because we don't have hornetq
-Patch3: %{name}-%{namedversion}-hornetq.patch
-
-# Patch to remove hornetq dependency from the pom (SOURCE0)
-Patch4: %{name}-%{namedversion}-pom.patch
-
-# Patch to remove hornetq dependency from the integration pom (SOURCE1)
-Patch5: %{name}-%{namedversion}-integration-pom.patch
-
 BuildArch: noarch
 
 BuildRequires: jpackage-utils
@@ -52,6 +43,7 @@ BuildRequires: jboss-logging-tools
 BuildRequires: jboss-connector-1.6-api
 BuildRequires: jboss-transaction-1.1-api
 BuildRequires: jboss-transaction-spi
+BuildRequires: hornetq
 BuildRequires: jfreechart
 BuildRequires: publican-jboss
 BuildRequires: java-service-wrapper
@@ -65,6 +57,7 @@ Requires: jboss-logging-tools
 Requires: jboss-connector-1.6-api
 Requires: jboss-transaction-1.1-api
 Requires: jboss-transaction-spi
+Requires: hornetq
 Requires: jfreechart
 Requires: java-service-wrapper
 
@@ -103,10 +96,6 @@ cp %{SOURCE2} jbossjta-integration.pom
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p0
-%patch5 -p0
-
 
 %build
 
@@ -136,6 +125,7 @@ byteman/byteman-install ext/byteman-install.jar
 byteman/byteman-submit ext/byteman-submit.jar
 jboss-transaction-spi ext/jboss-transaction-spi.jar
 jfreechart/jfreechart ext/jfreechart-1.0.6.jar
+hornetq/hornetq-core ext/hornetq-core.jar
 .
 
 # The above loop does not work for java service wrapper as the jar file is not
@@ -206,8 +196,10 @@ cp -rp install/htdocs/* %{buildroot}%{_javadocdir}/%{name}
 %files javadoc
 %{_javadocdir}/%{name}
 
-
 %changelog
+* Tue Jun 19 2012 Marek Goldmann <mgoldman at redhat.com> 4.16.2-4
+- Removed HornetQ patches, we have it now in Fedora
+
 * Tue Mar 20 2012 Juan Hernandez <juan.hernandez at redhat.com> 4.16.2-3
 - Use the namedversion macro in the source URLs
 - Fixed the version numbers in the changelog