[jetty/f18] Fix build conditionals

Mikolaj Izdebski mizdebsk at fedoraproject.org
Wed Oct 10 12:34:06 UTC 2012


commit adae7289f04b3ca01013fff93d65781dfafd590b
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Wed Oct 10 14:27:02 2012 +0200

    Fix build conditionals

 jetty.spec |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index 44c29e7..a1abaa3 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -42,14 +42,16 @@
 
 %global addver v20120716
 
+# Conditionals to help breaking eclipse <-> jetty dependency cycle
+# when bootstrapping for new architectures
 %if 0%{?fedora}
-%bcond_with nosql
-#%bcond_with osgi
+%bcond_without nosql
+#%%bcond_without osgi
 %endif
 
 Name:           jetty
 Version:        8.1.5
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 Group:          Applications/Internet
@@ -1051,6 +1053,9 @@ getent passwd %username &>/dev/null || useradd  -r -u %jtuid -g %username \
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Wed Oct 10 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 8.1.5-8
+- Fix build conditionals
+
 * Tue Oct  9 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 8.1.5-7
 - Introduce nosql and osgi conditionals
 - Temporarly disable osgi to bootstrap eclipse


More information about the scm-commits mailing list