commit a4a31a272c6eda926c7bbfd48624aae9fa09a633
Author: Andy Grimm <agrimm at gmail.com>
Date: Tue Aug 7 16:21:16 2012 -0400
Revert to JGroups 2.12, as JGroups 3 didn't work properly.
ha-jdbc.spec | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/ha-jdbc.spec b/ha-jdbc.spec
index ba09e87..b08708a 100644
--- a/ha-jdbc.spec
+++ b/ha-jdbc.spec
@@ -1,7 +1,7 @@
Summary: High-Availability JDBC
Name: ha-jdbc
Version: 2.0.16
-Release: 0.3.rc1%{?dist}
+Release: 0.4.rc1%{?dist}
Epoch: 0
License: LGPLv2+
URL: http://ha-jdbc.sourceforge.net/
@@ -12,7 +12,7 @@ Patch1: %{name}-jdk7.patch
Patch2: %{name}-jgroups3.patch
BuildRequires: jpackage-utils >= 0:1.6
BuildRequires: ant >= 0:1.6
-BuildRequires: jgroups
+BuildRequires: jgroups212
BuildRequires: junit
BuildRequires: slf4j
BuildRequires: jibx
@@ -21,7 +21,7 @@ BuildRequires: bcel
BuildRequires: tomcat-servlet-3.0-api
Requires: jpackage-utils >= 0:1.6
Requires: java >= 0:1.4.2
-Requires: jgroups
+Requires: jgroups212
Requires: jibx
Requires: quartz
Requires: tomcat-servlet-3.0-api
@@ -50,20 +50,20 @@ API documentation for %{name}.
rm -rf lib lib-1.4 lib-1.5
# This code is no longer compatible with JGroups
-pushd src/net/sf/hajdbc/distributable
-rm AbstractMembershipListener.java
-rm DistributableDatabaseClusterDecorator.java
-rm DistributableLockManager.java
-rm DistributableStateManager.java
-popd
+# pushd src/net/sf/hajdbc/distributable
+# rm AbstractMembershipListener.java
+# rm DistributableDatabaseClusterDecorator.java
+# rm DistributableLockManager.java
+# rm DistributableStateManager.java
+# popd
%patch0 -p1
%patch1 -p1
-%patch2 -p1
+# %patch2 -p1
%build
-export CLASSPATH=$( build-classpath jgroups jibx/jibx-run quartz slf4j/slf4j-api bcel jibx/jibx-bind tomcat-servlet-api )
-ant
+export CLASSPATH=$( build-classpath jgroups212 jibx/jibx-run quartz slf4j/slf4j-api bcel jibx/jibx-bind tomcat-servlet-api )
+ant jar-1.6
ant javadoc
%install
@@ -85,6 +85,9 @@ cp -pr doc/src/content/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%changelog
+* Tue Aug 06 2012 Andy Grimm <agrimm at gmail.com> - 0:2.0.16-0.4.rc1
+- Revert to JGroups 2.12, as JGroups 3 didn't work properly.
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:2.0.16-0.3.rc1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild