From 615639539e145a30f5c3888efa2391f2c64a2755 Mon Sep 17 00:00:00 2001
From: Ruediger Landmann <r.landmann@redhat.com>
Date: Jun 21 2011 06:22:37 +0000
Subject: Supply missing event-model.xml files


---

diff --git a/.gitignore b/.gitignore
index a578c97..c7cf340 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 fop-0.95-src.tar.gz
 fop-1.0-src.tar.gz
+/event-model.tgz
diff --git a/fop.script b/fop.script
index 2da49be..8e688e4 100644
--- a/fop.script
+++ b/fop.script
@@ -25,7 +25,8 @@ fi
 MAIN_CLASS=org.apache.fop.cli.Main
 # Set parameters
 set_jvm
-set_classpath commons-io batik-all avalon-framework xmlgraphics-commons \
+set_classpath commons-io batik-all avalon-framework-api \
+  avalon-framework-impl xmlgraphics-commons \
   commons-logging fop
 set_flags $BASE_FLAGS
 set_options $BASE_OPTIONS
diff --git a/fop.spec b/fop.spec
index bab3229..188d1ee 100644
--- a/fop.spec
+++ b/fop.spec
@@ -1,7 +1,7 @@
 Summary:	XSL-driven print formatter
 Name:		fop
 Version:	1.0
-Release:	14%{?dist}
+Release:	16%{?dist}
 License:	ASL 2.0
 Group:		Applications/Text
 URL:		http://xmlgraphics.apache.org/fop
@@ -9,6 +9,7 @@ Source0:	http://www.apache.org/dist/xmlgraphics/fop/source/%{name}-%{version}-sr
 Source1:	%{name}.script
 Source2:	batik-pdf-MANIFEST.MF
 Source3:	http://mirrors.ibiblio.org/pub/mirrors/maven2/org/apache/xmlgraphics/%{name}/%{version}/%{name}-%{version}.pom
+Source4:	event-model.tgz
 Patch0:		%{name}-manifest.patch
 Patch1:		%{name}-main.patch
 Patch2:		qdox-build.patch
@@ -59,7 +60,7 @@ Requires:	jpackage-utils
 Javadoc for %{name}.
 
 %prep
-%setup -q
+%setup -q -a 4
 %patch0 -p1
 %patch1 -p0
 %patch2 -b .sav
@@ -70,8 +71,8 @@ find -name '*.jar' -exec rm -f '{}' \;
 sed -i -e "s|1.4|1.5|g" build.xml
 
 %build
-export CLASSPATH=$(build-classpath apache-commons-logging apache-commons-io xmlgraphics-commons batik-all avalon-framework servlet batik/batik-svg-dom xml-commons-apis xml-commons-apis-ext qdox objectweb-asm/asm-all xmlunit)
-ant clean jar-main transcoder-pkg javadocs
+export CLASSPATH=$(build-classpath apache-commons-logging apache-commons-io xmlgraphics-commons batik-all avalon-framework-api avalon-framework-impl servlet batik/batik-svg-dom xml-commons-apis xml-commons-apis-ext qdox objectweb-asm/asm-all xmlunit)
+ant jar-main transcoder-pkg javadocs
 
 %install
 # inject OSGi manifests
@@ -130,6 +131,12 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 
 %changelog
+* Tue Jun 21 2011 Rüdiger Landmann <r.landmann@redhat.com> 1.0-16
+- Supply missing event-model.xml files
+
+* Fri Jun 3 2011 Rüdiger Landmann <r.landmann@redhat.com> 1.0-15
+- Split avalon-framework into avalon-framework-api and avalon-framework-impl in classpath
+
 * Thu Mar 10 2011 Alexander Kurtakov <akurtako@redhat.com> 1.0-14
 - Reapply Fedora guidelines.
 - Re-add pom.xml to unbreak Maven stack.
diff --git a/sources b/sources
index 49c53ca..bfb227b 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
+b5e6011022ea23187c3d591e55965113  event-model.tgz
 95dcc4c2dd08b4bc88ce9ce1ee88c439  fop-1.0-src.tar.gz