From fbd55be4735c9c9b4af01c81eabf92121a16c553 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Apr 18 2012 12:51:56 +0000 Subject: Replace eclipse-rcp BR with felix-framework - Add missing R: felix-framework --- diff --git a/jetty.spec b/jetty.spec index 9b8e6dc..41071b0 100644 --- a/jetty.spec +++ b/jetty.spec @@ -44,7 +44,7 @@ Name: jetty Version: 8.1.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java Webserver and Servlet Container Group: Applications/Internet @@ -63,26 +63,26 @@ Patch3: 0004-Change-servelt-groupId-to-javax.servlet.patch Patch4: 0005-Modify-dependencies.patch Patch5: 0006-Remove-pmd-plugin.patch +BuildRequires: eclipse-platform +BuildRequires: fedora-usermgmt-devel +BuildRequires: felix-framework +BuildRequires: geronimo-annotation +BuildRequires: geronimo-jaspic-spec +BuildRequires: geronimo-jta +BuildRequires: jakarta-taglibs-standard BuildRequires: java-devel >= 1:1.7.0 -BuildRequires: tomcat-lib -BuildRequires: tomcat-servlet-3.0-api -BuildRequires: tomcat-jsp-2.2-api -BuildRequires: tomcat-servlet-3.0-api -BuildRequires: tomcat-el-2.2-api BuildRequires: maven -BuildRequires: maven-enforcer-plugin BuildRequires: maven-dependency-plugin +BuildRequires: maven-enforcer-plugin BuildRequires: maven-war-plugin -BuildRequires: geronimo-jaspic-spec -BuildRequires: geronimo-jta -BuildRequires: geronimo-annotation -BuildRequires: eclipse-rcp -BuildRequires: eclipse-platform -BuildRequires: jakarta-taglibs-standard BuildRequires: mongo-java-driver >= 2.6.5-4 BuildRequires: objectweb-asm -BuildRequires: fedora-usermgmt-devel BuildRequires: systemd-units +BuildRequires: tomcat-el-2.2-api +BuildRequires: tomcat-jsp-2.2-api +BuildRequires: tomcat-lib +BuildRequires: tomcat-servlet-3.0-api +BuildRequires: tomcat-servlet-3.0-api # we want javamail not classpathx-javamail BuildRequires: %{_javadir}/javamail/mail.jar @@ -99,22 +99,22 @@ BuildRequires: jetty-artifact-remote-resources BuildArch: noarch Requires: chkconfig +Requires: felix-framework +Requires: geronimo-annotation +Requires: geronimo-jta +Requires: jakarta-taglibs-standard +Requires: javamail Requires: jpackage-utils >= 0:1.6 -Requires: tomcat-servlet-3.0-api Requires: jsp22 +Requires: objectweb-asm Requires: slf4j -Requires: javamail -Requires: xerces-j2 >= 0:2.7 -Requires: xml-commons-apis +Requires: tomcat-el-2.2-api +Requires: tomcat-jsp-2.2-api Requires: tomcat-lib Requires: tomcat-servlet-3.0-api -Requires: tomcat-jsp-2.2-api Requires: tomcat-servlet-3.0-api -Requires: tomcat-el-2.2-api -Requires: geronimo-jta -Requires: geronimo-annotation -Requires: jakarta-taglibs-standard -Requires: objectweb-asm +Requires: xerces-j2 >= 0:2.7 +Requires: xml-commons-apis %{?FE_USERADD_REQ} Requires(post): systemd-sysv @@ -403,6 +403,10 @@ fi %doc %{_javadocdir}/%{name} %changelog +* Wed Apr 18 2012 Mikolaj Izdebski - 8.1.0-5 +- Replace eclipse-rcp BR with felix-framework +- Add missing R: felix-framework + * Fri Feb 24 2012 Stanislav Ochotnicky - 8.1.0-4 - Add geronimo-annotation to Requires