rel-eng/packages/jpam | 2 +-
spec-tree/dwr/dwr.spec | 3 +++
spec-tree/jpam/jpam.spec | 11 +++++++++--
3 files changed, 13 insertions(+), 3 deletions(-)
New commits:
commit 24723249b9f0f6f382490174ebaadab43aa3cb86
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jan 8 10:40:50 2014 +0100
Automatic commit of package [jpam] minor release [0.4-24].
diff --git a/rel-eng/packages/jpam b/rel-eng/packages/jpam
index 4e3f1cd..6b9a847 100644
--- a/rel-eng/packages/jpam
+++ b/rel-eng/packages/jpam
@@ -1 +1 @@
-0.4-23 spec-tree/jpam/
+0.4-24 spec-tree/jpam/
diff --git a/spec-tree/jpam/jpam.spec b/spec-tree/jpam/jpam.spec
index e52ec0f..ac3c77d 100644
--- a/spec-tree/jpam/jpam.spec
+++ b/spec-tree/jpam/jpam.spec
@@ -20,7 +20,7 @@ Patch2: jpam-0.4-ppc.patch
Patch3: jpam-0.4-no_checkstyle.patch
Patch4: jpam-0.4-no-password-prompt.patch
Version: 0.4
-Release: 23%{?dist}
+Release: 24%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
Requires: %jpackage_run_jars
@@ -107,6 +107,10 @@ fi
%{_javadocdir}/%{name}-%{version}
%changelog
+* Wed Jan 08 2014 Tomas Lestach <tlestach(a)redhat.com> 0.4-24
+- let jpam buildrequire ant
+- let jpam build/require javapackages-tools on fc20
+
* Tue Jan 07 2014 Michael Mraka <michael.mraka(a)redhat.com> 0.4-23
- there's not ant-nodeps on fc20
- replace legacy name of Tagger with new one
commit f2766539f9f6571c11ffb4b3b7e18a89dc99beff
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jan 8 09:37:42 2014 +0100
let dwr buildrequire javapackages-tools on fc20
diff --git a/spec-tree/dwr/dwr.spec b/spec-tree/dwr/dwr.spec
index dd7942a..4691bb8 100644
--- a/spec-tree/dwr/dwr.spec
+++ b/spec-tree/dwr/dwr.spec
@@ -22,6 +22,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
Requires: java
BuildRequires: java-devel >= 1.5.0
BuildRequires: ant
+%if 0%{?fedora} >= 20
+BuildRequires: javapackages-tools
+%endif
%description
DWR is a Java library that enables Java on the server and JavaScript
commit 05cceb7895cf20e2ac576f0c13b0f3c3cf4655a6
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jan 8 09:58:53 2014 +0100
let jpam buildrequire ant
diff --git a/spec-tree/jpam/jpam.spec b/spec-tree/jpam/jpam.spec
index 26409d7..e52ec0f 100644
--- a/spec-tree/jpam/jpam.spec
+++ b/spec-tree/jpam/jpam.spec
@@ -5,7 +5,7 @@ Requires: apache-commons-io
%define jpackage_run_jars antlr jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-logging regexp
%endif
-%define jpackage_build_jars checkstyle junit
+%define jpackage_build_jars checkstyle junit ant
%define jpackage_jars %jpackage_run_jars %jpackage_build_jars
Summary: A JNI Wrapper for the Unix pam(8) subsystem and a JAAS bridge
commit 3981ccb90414842fe6388de24d49afc8c8e48022
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jan 8 09:08:40 2014 +0100
let jpam build/require javapackages-tools on fc20
diff --git a/spec-tree/jpam/jpam.spec b/spec-tree/jpam/jpam.spec
index 53d82b6..26409d7 100644
--- a/spec-tree/jpam/jpam.spec
+++ b/spec-tree/jpam/jpam.spec
@@ -29,6 +29,9 @@ BuildRequires: gcc make
BuildRequires: pam-devel
%if 0%{?fedora} && 0%{?fedora} < 20
BuildRequires: ant-nodeps
+%else
+BuildRequires: javapackages-tools
+Requires: javapackages-tools
%endif
BuildRequires: java-devel >= 1.6.0