[ini4j] 914089 - ini4j: FTBFS in rawhide
Omair Majid
omajid at fedoraproject.org
Fri Mar 1 21:03:20 UTC 2013
commit df1c90d11469b7812335128a917b5bea12c11a17
Author: Omair Majid <omajid at redhat.com>
Date: Fri Mar 1 16:03:02 2013 -0500
914089 - ini4j: FTBFS in rawhide
ini4j-add-version-bsh.patch | 11 +++++++++++
ini4j.spec | 5 +++++
2 files changed, 16 insertions(+), 0 deletions(-)
---
diff --git a/ini4j-add-version-bsh.patch b/ini4j-add-version-bsh.patch
new file mode 100644
index 0000000..51408b1
--- /dev/null
+++ b/ini4j-add-version-bsh.patch
@@ -0,0 +1,11 @@
+diff -ruN ini4j-0.5.1.orig/pom.xml ini4j-0.5.1/pom.xml
+--- ini4j-0.5.1.orig/pom.xml 2013-03-01 13:15:58.775000000 -0500
++++ ini4j-0.5.1/pom.xml 2013-03-01 15:55:16.499000000 -0500
+@@ -294,6 +294,7 @@
+ <artifactItem>
+ <groupId>org.beanshell</groupId>
+ <artifactId>bsh</artifactId>
++ <version>1.3.0</version>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
diff --git a/ini4j.spec b/ini4j.spec
index 17ac2ba..74b56d7 100644
--- a/ini4j.spec
+++ b/ini4j.spec
@@ -20,6 +20,9 @@ Patch4: %{name}-remove-checkstyle-and-pmd-checks.patch
Patch5: %{name}-encoding.patch
# removing maven-license-plugin BR
Patch6: %{name}-remove-license-plugin.patch
+# need to specify version explicitly for maven-dependency-plugin:unpack
+# the normal version a specified in the dependency elment is ignored by maven
+Patch7: %{name}-add-version-bsh.patch
BuildArch: noarch
@@ -29,6 +32,7 @@ BuildRequires: java-devel >= 1:1.6.0
BuildRequires: maven-local
+BuildRequires: bsh
BuildRequires: javamail
BuildRequires: maven-antrun-plugin
BuildRequires: maven-assembly-plugin
@@ -79,6 +83,7 @@ find . -type f \( -iname "*.jar" -o -iname "*.class" -o -iname "*.exe" -o -iname
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
%build
More information about the scm-commits
mailing list