[jetty] Fix OSGi conditionals

[Mikolaj Izdebski]

commit c88b536e2147c22c8ab223d78177eca1a1f1c29a
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Thu Apr 18 12:07:15 2013 +0200

    Fix OSGi conditionals

 jetty.spec |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index f1d08fb..bc6279c 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -220,12 +220,6 @@ Summary:        http module for Jetty
 %description    http
 %{extdesc} %{summary}.
 
-%package        httpservice
-Summary:        httpservice module for Jetty
-
-%description    httpservice
-%{extdesc} %{summary}.
-
 %package        io
 Summary:        io module for Jetty
 
@@ -407,6 +401,12 @@ Summary:        nosql module for Jetty
 %endif
 
 %if %{with osgi}
+%package        httpservice
+Summary:        httpservice module for Jetty
+
+%description    httpservice
+%{extdesc} %{summary}.
+
 %package        osgi-boot
 Summary:        osgi-boot module for Jetty
 
@@ -521,7 +521,6 @@ find . -name "*.class" -exec rm {} \;
 # Disable OSGi
 %if %{without osgi}
 %pom_disable_module jetty-osgi
-%pom_xpath_remove "pom:profile[pom:id[text()='osgi']]"
 %endif
 
 # Disable NoSQL
@@ -733,7 +732,6 @@ getent passwd %username &>/dev/null || useradd  -r -u %jtuid -g %username \
 %files continuation -f .mfiles-jetty-continuation
 %files deploy -f .mfiles-jetty-deploy
 %files http -f .mfiles-jetty-http
-%files httpservice -f .mfiles-jetty-httpservice
 %files io -f .mfiles-jetty-io
 %files jaas -f .mfiles-jetty-jaas
 %files jaspi -f .mfiles-jetty-jaspi
@@ -768,6 +766,7 @@ getent passwd %username &>/dev/null || useradd  -r -u %jtuid -g %username \
 %endif
 
 %if %{with osgi}
+%files httpservice -f .mfiles-jetty-httpservice
 %files osgi-project -f .mfiles-jetty-osgi-project
 %files osgi-boot -f .mfiles-jetty-osgi-boot
 %files osgi-boot-warurl -f .mfiles-jetty-osgi-boot-warurl
@@ -786,6 +785,7 @@ getent passwd %username &>/dev/null || useradd  -r -u %jtuid -g %username \
 * Thu Apr 18 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 9.0.0-3
 - Remove maven-license-plugin
 - Conditionally disable jetty-spring
+- Fix OSGi conditionals
 
 * Wed Apr 10 2013 Michal Srb <msrb at redhat.com> - 9.0.0-2
 - Replace tomcat libs with glassfish libs