java/build.xml | 14 ++++++++++++--
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 17 insertions(+), 4 deletions(-)
New commits:
commit 3c89791108bfe6fb7ff055ca585ef182d26d863b
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Tue May 21 16:42:28 2013 -0400
Automatic commit of package [spacewalk-java] release [1.10.79-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 212af19..11e0021 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.10.78
+Version: 1.10.79
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -751,6 +751,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue May 21 2013 Grant Gainey <ggainey(a)redhat.com> 1.10.79-1
+- Provide way to build Eclipse .classpath even in the absence of required jars
+
* Tue May 21 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.78-1
- misc branding clean up
- branding clean-up of logrotate files
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 8d87065..13b3903 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.78-1 java/
+1.10.79-1 java/
commit b310f563f0f9df7ae3a57920bf9119f2cd94ed10
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Tue May 21 16:38:43 2013 -0400
Provide way to build Eclipse .classpath even in the absence of required jars
diff --git a/java/build.xml b/java/build.xml
index 1431394..6077bb6 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -61,8 +61,8 @@
</copy>
</target>
- <!-- Generates Eclipse classpath -->
- <target name="gen-eclipse" depends="link-jars"
+ <!-- Generates Eclipse .classpath -->
+ <target name="gen-eclipse-base" depends="resolve"
description = "Generates eclipse .classpath file">
<exec executable="${basedir}/scripts/gen-eclipse.py"
output="${basedir}/.classpath" >
@@ -70,6 +70,11 @@
</exec>
</target>
+ <!-- Generates Eclipse classpath after setting up dependent jars -->
+ <target name="gen-eclipse" depends="gen-eclipse-base,
link-jars"
+ description = "Generates eclipse .classpath file after linking
jars">
+ </target>
+
<target name="missingstrings"
description="prints out a report with untranslated strings.">
<mkdir dir="${report.dir}" />
@@ -929,6 +934,11 @@ delete from rhnChannel where label like 'ChannelLabel%';
</delete>
</target>
+ <!--
+ Set up Eclipse project files
+ NOTE: If this fails due to missing-jars, and you want to continue,
+ then execute "ant gen-eclipse-base" and retry
+ -->
<target name="make-eclipse-project" depends = "gen-eclipse"
description="Configures this checkout as an eclipse project.">
<copy toDir="${rhn-home}" overwrite="false">