diff --git a/jetty.spec b/jetty.spec index e89c9c4..fbd0129 100644 --- a/jetty.spec +++ b/jetty.spec @@ -46,12 +46,12 @@ # when bootstrapping for new architectures %if 0%{?fedora} %bcond_without nosql -#%%bcond_without osgi +%bcond_without osgi %endif Name: jetty Version: 8.1.5 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Java Webserver and Servlet Container Group: Applications/Internet @@ -763,7 +763,6 @@ pushd jetty-osgi %{buildroot}%{_javadir}/%{name}/$module.jar install -pm 644 jetty-osgi-httpservice/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-$module.pom %add_maven_depmap JPP.%{name}-$module.pom %{name}/$module.jar -f jetty-osgi - popd %endif @@ -934,7 +933,7 @@ getent passwd %username &>/dev/null || useradd -r -u %jtuid -g %username \ %endif %if %{with osgi} -%files osgi -f .mfiles-jetty-osgi +%files osgi -f jetty-osgi/.mfiles-jetty-osgi %endif %files javadoc @@ -942,6 +941,9 @@ getent passwd %username &>/dev/null || useradd -r -u %jtuid -g %username \ %doc %{_javadocdir}/%{name} %changelog +* Fri Dec 14 2012 Stanislav Ochotnicky - 8.1.5-10 +- Reenable osgi support + * Mon Nov 5 2012 Stanislav Ochotnicky - 8.1.5-9 - Use file lists generated by improved add_maven_depmap macro