commit 68d99d1f6a6284d1ce5ed1377afe06dc49c55131
Author: Jan Rękorajski <[email protected]>
Date: Wed Aug 8 11:22:50 2012 +0200
Updated jgoodies deps and patch
ice.spec | 1 +
java-build.patch | 19 +++++++++++--------
2 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/ice.spec b/ice.spec
index 0893b03..e98c645 100644
--- a/ice.spec
+++ b/ice.spec
@@ -51,6 +51,7 @@ BuildRequires: mono-csharp
%if %{with java}
BuildRequires: ant-nodeps
BuildRequires: db-java-devel
+BuildRequires: java-jgoodies-common
BuildRequires: java-jgoodies-forms
BuildRequires: java-jgoodies-looks
BuildRequires: jdk
diff --git a/java-build.patch b/java-build.patch
index 85c5803..43782c1 100644
--- a/java-build.patch
+++ b/java-build.patch
@@ -17,7 +17,7 @@ diff -ur Ice-3.4.0.orig/java/build.xml
Ice-3.4.0/java/build.xml
<target name="icegridadmin-plain-jar" depends="icegridadmin-compile"
if="build-icegridadmin-plain-jar" unless="ice.bin.dist">
- <manifest file="${lib.dir}/icegridgui.mf">
- <attribute name="Main-Class" value="IceGridGUI.Main"/>
-- <attribute name="Class-Path" value="Ice.jar ${jgoodies.forms}
${jgoodies.looks} ../resources/ "/>
+- <attribute name="Class-Path" value="Ice.jar ${jgoodies.forms}
${jgoodies.looks} ${jgoodies.common} ../resources/ "/>
- </manifest>
- <jar jarfile="${lib.dir}/IceGridGUI.jar"
manifest="${lib.dir}/icegridgui.mf" basedir="${lib.dir}">
+ <jar jarfile="${lib.dir}/IceGridGUI.jar" basedir="${lib.dir}">
@@ -41,13 +41,16 @@ diff -ur Ice-3.4.0.orig/java/build.xml
Ice-3.4.0/java/build.xml
<target name="install-common">
--- Ice-3.4.1/java/config/build.properties~ 2010-06-03 19:48:34.000000000
+0300
+++ Ice-3.4.1/java/config/build.properties 2010-06-10 11:01:36.101008204
+0300
-@@ -31,7 +31,7 @@
+@@ -31,9 +31,9 @@
# These properties only need to be set if you want to build the
# standalone jar for the IceGrid GUI.
#
--jgoodies.forms = /usr/share/java/forms-1.3.0.jar
--jgoodies.looks = /usr/share/java/looks-2.3.1.jar
-++jgoodies.forms = /usr/share/java/jgoodies-forms.jar
-++jgoodies.looks = /usr/share/java/jgoodies-looks.jar
- #jgoodies.forms = C:/Program\
Files/ZeroC/Ice-${ice.version}-ThirdParty/lib/forms-1.3.0.jar
- #jgoodies.looks = C:/Program\
Files/ZeroC/Ice-${ice.version}-ThirdParty/lib/looks-2.3.1.jar
+-jgoodies.common = /usr/share/java/jgoodies-common-1.2.0.jar
+-jgoodies.forms = /usr/share/java/jgoodies-forms-1.4.1.jar
+-jgoodies.looks = /usr/share/java/jgoodies-looks-2.4.1.jar
++jgoodies.common = /usr/share/java/jgoodies-common.jar
++jgoodies.forms = /usr/share/java/jgoodies-forms.jar
++jgoodies.looks = /usr/share/java/jgoodies-looks.jar
+ #jgoodies.common = C:/Program\
Files/ZeroC/Ice-${ice.version}-ThirdParty/lib/jgoodies-common-1.2.0.jar
+ #jgoodies.forms = C:/Program\
Files/ZeroC/Ice-${ice.version}-ThirdParty/lib/jgoodies-forms-1.4.1.jar
+ #jgoodies.looks = C:/Program\
Files/ZeroC/Ice-${ice.version}-ThirdParty/lib/jgoodies-looks-2.4.1.jar
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
