[fop] * Thu Mar 10 2011 Rüdiger Landmann <r.landmann at redhat.com> 1.0-13 - reinstate updated manifest patc

[Rüdiger Landmann]

commit d8edc4f3948c3a8eddfb759ba39bcf6941b57c68
Author: Ruediger Landmann <r.landmann at redhat.com>
Date:   Thu Mar 10 15:37:58 2011 +1000

    * Thu Mar 10 2011 Rüdiger Landmann <r.landmann at redhat.com> 1.0-13
    - reinstate updated manifest patch
    - change define to global
    
    * Thu Mar 10 2011 Rüdiger Landmann <r.landmann at redhat.com> 1.0-12
    - buildarch: noarch
    
    * Thu Mar 10 2011 Rüdiger Landmann <r.landmann at redhat.com> 1.0-11
    - drop obsolete manifest patch

 fop-manifest.patch |   25 ++++++++++++++++++++++++
 fop.spec           |   53 +++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 75 insertions(+), 3 deletions(-)
---
diff --git a/fop-manifest.patch b/fop-manifest.patch
new file mode 100644
index 0000000..d1e23a9
--- /dev/null
+++ b/fop-manifest.patch
@@ -0,0 +1,25 @@
+diff -uN fop-1.0/build.xml fop-1.0-mod/build.xml
+--- fop-1.0/build.xml	2010-07-13 05:34:37.000000000 +1000
++++ fop-1.0-mod/build.xml	2011-03-10 14:42:17.000000000 +1000
+@@ -517,10 +517,10 @@
+     <pathconvert property="manifest.classpath" dirsep="/" pathsep=" " refid="libs-build-classpath">
+       <map from="${basedir}${file.separator}lib${file.separator}" to=""/>
+     </pathconvert>
+-    <jar jarfile="${build.dir}/fop.jar" basedir="${build.classes.dir}">
++    <jar jarfile="${build.dir}/fop.jar" 
++       basedir="${build.classes.dir}"
++       manifest="${basedir}/fop.mf">
+       <manifest>
+-        <attribute name="Main-Class" value="org.apache.fop.cli.Main"/>
+-        <attribute name="Class-Path" value="${manifest.classpath}"/>
+         <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java ${javac.target}])"/>
+         <section name="org/apache/fop/">
+           <attribute name="Specification-Title" value="XSL-FO - Extensible Stylesheet Language"/>
+
+--- fop-1.0/fop.mf	2011-03-10 14:53:21.000000000 +1000
++++ fop-1.0-mod/fop.mf	2011-03-10 14:53:21.000000000 +1000
+@@ -0,0 +1,3 @@
++Manifest-Version: 1.0
++Main-Class: org.apache.fop.cli.Main
++
+
diff --git a/fop.spec b/fop.spec
index a98affc..3b81886 100644
--- a/fop.spec
+++ b/fop.spec
@@ -1,15 +1,17 @@
-%define gcj_support 0
+%global gcj_support 0
 
 Summary:	XSL-driven print formatter
 Name:		fop
 Version:	1.0
-Release:	11%{?dist}
+Release:	13%{?dist}
 License:	ASL 2.0
 Group:		Applications/Text
 URL:		http://xmlgraphics.apache.org/fop
 Source0:	http://www.apache.org/dist/xmlgraphics/fop/source/%{name}-%{version}-src.tar.gz
 Source1:	%{name}.script
+Patch0:		%{name}-manifest.patch
 Patch1:		%{name}-main.patch
+BuildArch:      noarch
 Requires:	xmlgraphics-commons >= 1.2
 Requires:	avalon-framework >= 4.1.4
 Requires:	batik >= 1.7
@@ -19,10 +21,12 @@ Requires:	jakarta-commons-httpclient
 Requires:	jakarta-commons-io >= 1.2
 Requires:	jakarta-commons-logging >= 1.0.4
 Requires:	java-1.6.0-openjdk
+Requires:  	jpackage-utils
 BuildRequires:	ant
 BuildRequires:	ant-trax
 BuildRequires:  java-1.6.0-openjdk-devel
 BuildRequires:  java-1.6.0-openjdk-javadoc
+BuildRequires:  jpackage-utils
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 %description
@@ -42,6 +46,7 @@ Javadoc for %{name}.
 
 %prep
 %setup -q
+%patch0 -p1
 %patch1 -p0
 
 %build
@@ -111,14 +116,56 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Mar 10 2011 Rüdiger Landmann <r.landmann at redhat.com> 1.0-13
+- reinstate updated manifest patch
+- change define to global
+
+* Thu Mar 10 2011 Rüdiger Landmann <r.landmann at redhat.com> 1.0-12
+- buildarch: noarch
+
 * Thu Mar 10 2011 Rüdiger Landmann <r.landmann at redhat.com> 1.0-11
-- import 1.0 into Fedora, based on Mandriva package
 - drop obsolete manifest patch
 
+* Wed Mar 10 2011 Rüdiger Landmann <r.landmann at redhat.com> 1.0-10
+- import 1.0 into Fedora, based on Mandriva package
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Tue Jan 4 2011 Rüdiger Landmann <r.landmann at redhat.com> - 1.0-8
+- BR qdox
+
+* Tue Jan 4 2011 Rüdiger Landmann <r.landmann at redhat.com> - 1.0-7
+- set BR on xmlgraphics-commons >= 1.4
+- Add qdox classpath
+
 * Thu Dec 09 2010 Paulo Ricardo Zanoni <pzanoni at mandriva.com> 1.0-0.0.3mdv2011.0
 - Revision: 617684
 - Resubmit after moving
 
+* Fri Dec 3 2010 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.0-6
+- Add LICENSE to javadoc sub-package
+- Few other tweaks according to new guidelines
+- Make jars and javadoc versionless
+- Add pom file (Resolves rhbz#655804)
+
+* Fri Oct 1 2010 Alexander Kurtakov <akurtako at redhat.com> 1.0-5
+- We need servlet not jsp.
+
+* Fri Oct 1 2010 Alexander Kurtakov <akurtako at redhat.com> 1.0-4
+- BR jsp.
+
+* Fri Oct 1 2010 Alexander Kurtakov <akurtako at redhat.com> 1.0-3
+- Add more BRs.
+
+* Fri Oct 1 2010 Alexander Kurtakov <akurtako at redhat.com> 1.0-2
+- BR ant-nodeps.
+
+* Fri Oct 1 2010 Alexander Kurtakov <akurtako at redhat.com> 1.0-1
+- Update to 1.0.
+- BR/R java 1.6.0 not openjdk (rhbz#620330).
+- Remove jars in prep.
+
 * Sat Sep 04 2010 Tomasz Pawel Gajc <tpg at mandriva.org> 1.0-0.0.2mdv2011.0
 - Revision: 576002
 - rebuild for new xmlgraphics-commons