[groovy18] fix groovy18-script
by gil
commit e67c5c70f3364f19f4a6c51969b3d59a97e80d07
Author: gil <puntogil(a)libero.it>
Date: Thu Jul 4 20:36:41 2013 +0200
fix groovy18-script
groovy18-script | 2 +-
groovy18.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/groovy18-script b/groovy18-script
index ab5d5cd..32b650e 100644
--- a/groovy18-script
+++ b/groovy18-script
@@ -66,7 +66,7 @@ BASE_JARS="$BASE_JARS objectweb-asm/asm-util"
BASE_JARS="$BASE_JARS bsf"
BASE_JARS="$BASE_JARS commons-cli"
BASE_JARS="$BASE_JARS commons-logging"
-BASE_JARS="$BASE_JARS groovy18"
+BASE_JARS="$BASE_JARS groovy18-1.8"
BASE_JARS="$BASE_JARS ivy"
BASE_JARS="$BASE_JARS jline"
BASE_JARS="$BASE_JARS jsp"
diff --git a/groovy18.spec b/groovy18.spec
index 4f87a59..5ea003e 100644
--- a/groovy18.spec
+++ b/groovy18.spec
@@ -4,7 +4,7 @@
%global majorversion 1.8
Name: groovy18
Version: 1.8.9
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Dynamic language for the Java Platform
Group: Development/Languages
# Some of the files are licensed under BSD and CPL terms, but the CPL has been superceded
@@ -175,6 +175,9 @@ install -p -m644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
%doc LICENSE.txt LICENSE-2.0.txt NOTICE.txt cpl-v10.txt epl-v10.txt
%changelog
+* Thu Jul 04 2013 gil cattaneo <puntogil(a)libero.it> - 1.8.9-3
+- fix groovy18-script, thanks to Matt Spaulding
+
* Tue Jun 11 2013 gil cattaneo <puntogil(a)libero.it> - 1.8.9-2
- packaged as a compatibility package
10 years, 11 months
[hamcrest] Add easymock2 to classpath (Resolves: #979501)
by Mikolaj Izdebski
commit 1dc3672395174f83171a0fb6b2edd3a00bc0746f
Author: Michal Srb <msrb(a)redhat.com>
Date: Wed Jul 3 13:06:01 2013 +0200
Add easymock2 to classpath (Resolves: #979501)
Signed-off-by: Mikolaj Izdebski <mizdebsk(a)redhat.com>
hamcrest.spec | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/hamcrest.spec b/hamcrest.spec
index 02f6c50..55601fb 100644
--- a/hamcrest.spec
+++ b/hamcrest.spec
@@ -50,7 +50,7 @@
Name: hamcrest
Version: 1.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 0
Summary: Library of matchers for building test expressions
License: BSD
@@ -90,7 +90,9 @@ BuildRequires: java-devel >= 1:1.6.0
BuildRequires: ant >= 0:1.6.5
BuildRequires: ant-junit
BuildRequires: zip
+%if %with integration
BuildRequires: easymock2
+%endif
%if %with jarjar
BuildRequires: jarjar
%endif
@@ -142,10 +144,9 @@ ln -sf $(build-classpath jarjar) lib/generator/
ln -sf $(build-classpath qdox) lib/generator/
# BUILD/hamcrest-1.1/lib/integration/easymock-2.2.jar.no
%if %with integration
-ln -sf $(build-classpath easymock2) lib/integration/
-%endif
+# easymock2 is now compat package
+ln -sf $(build-classpath easymock2-2.4) lib/integration/
# BUILD/hamcrest-1.1/lib/integration/jmock-1.10RC1.jar.no
-%if %with integration
ln -sf $(build-classpath jmock) lib/integration/
%endif
# BUILD/hamcrest-1.1/lib/integration/testng-4.6-jdk15.jar.no
@@ -269,6 +270,9 @@ cp -pr %{name}-examples $RPM_BUILD_ROOT%{_datadir}/%{name}/
%{_datadir}/%{name}
%changelog
+* Wed Jul 03 2013 Michal Srb <msrb(a)redhat.com> - 0:1.3-2
+- Add easymock2 to classpath (Resolves: #979501)
+
* Thu Mar 21 2013 Tomas Radej <tradej(a)redhat.com> - 0:1.3-1
- Updated to latest upstream version
10 years, 11 months