commit abc96d0932e55613a15046e5ff8c81835e7786fb Author: Mary Ellen Foster mefoster@gmail.com Date: Fri May 11 10:39:57 2012 +0100
Necessary changes to build against older jetty on F16
logback.spec | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) --- diff --git a/logback.spec b/logback.spec index 3718064..6252de4 100644 --- a/logback.spec +++ b/logback.spec @@ -20,8 +20,7 @@ BuildRequires: java-devel >= 1:1.6.0 # Required libraries BuildRequires: jms BuildRequires: janino -# Using the version of jetty in the pom.xml file -BuildRequires: jetty >= 7.5.1 +BuildRequires: jetty BuildRequires: slf4j BuildRequires: servlet25 BuildRequires: tomcat-lib @@ -42,7 +41,7 @@ Requires: jpackage-utils # Java library dependencies Requires: jms Requires: janino -Requires: jetty >= 7.5.1 +Requires: jetty Requires: slf4j Requires: tomcat-lib Requires: servlet25 @@ -88,6 +87,10 @@ Sample code for the Logback library
find . -name "*.jar" -delete
+# Use old Jetty API on F16 +find . -name "*.java" -exec sed -i 's/org.eclipse.jetty.http/org.mortbay.jetty/g' '{}' ; +find . -name "*.java" -exec sed -i 's/org.eclipse.jetty.server/org.mortbay.jetty/g' '{}' ; + # Clean up the documentation sed -i 's/\r//' LICENSE.txt README.txt docs/*.* docs/*/*.* docs/*/*/*.* sed -i 's#"apidocs#"%{_javadocdir}/%{name}-%{version}#g' docs/*.html @@ -95,7 +98,7 @@ rm -rf docs/apidocs docs/project-reports docs/testapidocs docs/project-reports.h rm -f docs/manual/.htaccess docs/css/site.css # Zero-length file
%build -export CLASSPATH=`build-classpath antlr groovy janino javamail commons-compiler commons-cli tomcat6-servlet-api objectweb-asm jms slf4j jetty tomcat/catalina` +export CLASSPATH=`build-classpath antlr groovy janino javamail commons-cli tomcat6-servlet-api objectweb-asm jms slf4j jetty/jetty jetty/jetty-util tomcat/catalina` ant jar.all jar.access javadoc
%install
java-sig-commits@lists.fedoraproject.org