[fop] Add pom file (Resolves rhbz#655804)
Stanislav Ochotnicky
sochotni at fedoraproject.org
Fri Dec 3 14:48:22 UTC 2010
commit 9ad070f68f11ac51cc11d268b3bf8777cbacbc7b
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date: Fri Dec 3 15:26:43 2010 +0100
Add pom file (Resolves rhbz#655804)
- Add LICENSE to javadoc sub-package
- Few other tweaks according to new guidelines
- Make jars and javadoc versionless
fop-1.0.pom | 150 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
fop.spec | 36 ++++++++------
2 files changed, 170 insertions(+), 16 deletions(-)
---
diff --git a/fop-1.0.pom b/fop-1.0.pom
new file mode 100644
index 0000000..46b43c4
--- /dev/null
+++ b/fop-1.0.pom
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Id$ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>fop</artifactId>
+ <packaging>jar</packaging>
+ <name>Apache FOP</name>
+ <version>1.0</version>
+ <url>http://xmlgraphics.apache.org/fop/</url>
+ <description>Apache FOP (Formatting Objects Processor) is the world's first print formatter driven by XSL formatting objects (XSL-FO) and the world's first output independent formatter. It is a Java application that reads a formatting object (FO) tree and renders the resulting pages to a specified output. Output formats currently supported include PDF, PCL, PS, AFP, TIFF, PNG, SVG, XML (area tree representation), Print, AWT and TXT. The primary output target is PDF.</description>
+ <inceptionYear>1999</inceptionYear>
+ <mailingLists>
+ <mailingList>
+ <name>FOP Users List</name>
+ <subscribe>fop-users-subscribe at xmlgraphics.apache.org</subscribe>
+ <unsubscribe>fop-users-unsubscribe at xmlgraphics.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-users/</archive>
+ </mailingList>
+ <mailingList>
+ <name>FOP Developer List</name>
+ <subscribe>fop-dev-subscribe at xmlgraphics.apache.org</subscribe>
+ <unsubscribe>fop-dev-unsubscribe at xmlgraphics.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-dev/</archive>
+ </mailingList>
+ <mailingList>
+ <name>FOP Commit List</name>
+ <subscribe>fop-commits-subscribe at xmlgraphics.apache.org</subscribe>
+ <unsubscribe>fop-commits-unsubscribe at xmlgraphics.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-commits/</archive>
+ </mailingList>
+ </mailingLists>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/trunk/?root=Apache-SVN</url>
+ </scm>
+ <organization>
+ <name>Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
+ <dependencies>
+ <!-- XML Graphics -->
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>xmlgraphics-commons</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-svg-dom</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-bridge</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-awt-util</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-gvt</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-transcoder</artifactId>
+ <version>1.7</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>fop</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-extension</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-ext</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <!-- other dependencies -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>4.3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ <version>4.3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/fop.spec b/fop.spec
index c8fd022..2d40ed9 100644
--- a/fop.spec
+++ b/fop.spec
@@ -1,12 +1,13 @@
Summary: XSL-driven print formatter
Name: fop
Version: 1.0
-Release: 5%{?dist}
+Release: 6%{?dist}
License: ASL 2.0
Group: Applications/Text
Source0: http://www.apache.org/dist/xmlgraphics/fop/source/%{name}-%{version}-src.tar.gz
Source1: %{name}.script
Source2: batik-pdf-MANIFEST.MF
+Source3: http://mirrors.ibiblio.org/pub/mirrors/maven2/org/apache/xmlgraphics/%{name}/%{version}/%{name}-%{version}.pom
Patch0: %{name}-main.patch
URL: http://xmlgraphics.apache.org/fop
@@ -22,7 +23,6 @@ Requires: java >= 1:1.6.0
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ant
BuildRequires: ant-nodeps
BuildRequires: java-devel >= 1:1.6.0
@@ -65,7 +65,6 @@ export CLASSPATH=$(build-classpath ant-nodeps xmlgraphics-commons avalon-framewo
ant clean jar-main transcoder-pkg javadocs
%install
-rm -rf $RPM_BUILD_ROOT
# inject OSGi manifests
mkdir -p META-INF
cp -p %{SOURCE2} META-INF/MANIFEST.MF
@@ -74,13 +73,8 @@ zip -u build/%{name}.jar META-INF/MANIFEST.MF
# jars
mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p build/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+cp -p build/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
cp -p build/%{name}-transcoder.jar $RPM_BUILD_ROOT%{_javadir}/pdf-transcoder.jar
-pushd $RPM_BUILD_ROOT%{_javadir}
-for jar in *-%{version}*
-do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
-done
-popd
# script
mkdir -p $RPM_BUILD_ROOT%{_bindir}
@@ -91,14 +85,17 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
cp -pr conf $RPM_BUILD_ROOT%{_datadir}/%{name}
# javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
%add_to_maven_depmap org.apache.xmlgraphics %{name} %{version} JPP %{name} %{version}
-%clean
-rm -rf $RPM_BUILD_ROOT
+%pre javadoc
+# workaround for rpm bug 646523, can be removed in F-17
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%post
%update_maven_depmap
@@ -110,20 +107,27 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc LICENSE README NOTICE
-%{_javadir}/%{name}*.jar
-%{_datadir}/%{name}
+%{_javadir}/%{name}.jar
%{_javadir}/pdf-transcoder.jar
+%{_datadir}/%{name}
%{_mavendepmapfragdir}/*
+%{_mavenpomdir}/*pom
%attr(0755,root,root) %{_bindir}/fop
%files javadoc
%defattr(-,root,root,-)
-%doc %{_javadocdir}/%{name}-%{version}
+%doc LICENSE
%doc %{_javadocdir}/%{name}
%changelog
+* 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.
More information about the scm-commits
mailing list