[itext] minor changes to current guideline
gil
gil at fedoraproject.org
Fri Mar 1 06:05:14 UTC 2013
commit e391f025ba487834d8a55180c0f37f09ce621ba7
Author: gil <puntogil at libero.it>
Date: Fri Mar 1 07:04:49 2013 +0100
minor changes to current guideline
itext-rtf-2.1.7.pom | 102 ++++++++++++++++++++++++++++++++++++++
itext-rups-2.1.7.pom | 102 ++++++++++++++++++++++++++++++++++++++
itext.spec | 134 +++++++++++++++++--------------------------------
3 files changed, 251 insertions(+), 87 deletions(-)
---
diff --git a/itext-rtf-2.1.7.pom b/itext-rtf-2.1.7.pom
new file mode 100644
index 0000000..55c1a36
--- /dev/null
+++ b/itext-rtf-2.1.7.pom
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>com.lowagie</groupId>
+ <artifactId>itext-rtf</artifactId>
+ <packaging>jar</packaging>
+ <name>iText, a Free Java-PDF library (rtf package)</name>
+ <version>2.1.7</version>
+ <description>iText, a free Java-PDF library (rtf package)</description>
+ <url>http://www.lowagie.com/iText/</url>
+ <mailingLists>
+ <mailingList>
+ <name>iText Questions</name>
+ <subscribe>
+ http://lists.sourceforge.net/lists/listinfo/itext-questions
+ </subscribe>
+ <post>itext-questions at lists.sourceforge.net</post>
+ <archive>
+ http://news.gmane.org/gmane.comp.java.lib.itext.general
+ </archive>
+ <otherArchives>
+ <otherArchive>http://www.nabble.com/iText---General-f2701.html</otherArchive>
+ <otherArchive>http://www.junlu.com/2.html</otherArchive>
+ <otherArchive>http://sourceforge.net/mailarchive/forum.php?forum_id=3273</otherArchive>
+ <otherArchive>http://www.mail-archive.com/itext-questions%40lists.sourceforge.net/</otherArchive>
+ </otherArchives>
+ </mailingList>
+ </mailingLists>
+ <developers>
+ <developer>
+ <id>blowagie</id>
+ <name>Bruno Lowagie</name>
+ <email>bruno at lowagie.com</email>
+ <url>http://www.lowagie.com</url>
+ </developer>
+ <developer>
+ <id>psoares33</id>
+ <name>Paulo Soares</name>
+ <email>psoares33 at users.sourceforge.net</email>
+ </developer>
+ <developer>
+ <id>hallm</id>
+ <name>Mark Hall</name>
+ <email>hallm at users.sourceforge.net</email>
+ </developer>
+ <developer>
+ <id>xlv</id>
+ <name>Xavier Le Vourch</name>
+ <email>xlv at users.sourceforge.net</email>
+ </developer>
+ </developers>
+ <licenses>
+ <license>
+ <name>Mozilla Public License</name>
+ <url>http://www.mozilla.org/MPL/MPL-1.1.html</url>
+ <comments>
+ iText was originally published under the LGPLicense.
+ LGPL can be used as an alternative license for the MPL.
+ </comments>
+ </license>
+ </licenses>
+ <scm>
+ <connection>scm:svn:http://itext.svn.sourceforge.net/svnroot/itext</connection>
+ <url>http://itext.svn.sourceforge.net/viewvc/itext</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcmail-jdk14</artifactId>
+ <version>138</version>
+ </dependency>
+ <dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk14</artifactId>
+ <version>138</version>
+ </dependency>
+ <dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bctsp-jdk14</artifactId>
+ <version>138</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>
+ com.lowagie.tools.ToolboxAvailable
+ </mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/itext-rups-2.1.7.pom b/itext-rups-2.1.7.pom
new file mode 100644
index 0000000..92a2667
--- /dev/null
+++ b/itext-rups-2.1.7.pom
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>com.lowagie</groupId>
+ <artifactId>itext-rups</artifactId>
+ <packaging>jar</packaging>
+ <name>iText, a Free Java-PDF library (rups package)</name>
+ <version>2.1.7</version>
+ <description>iText, a free Java-PDF library (rups package)</description>
+ <url>http://www.lowagie.com/iText/</url>
+ <mailingLists>
+ <mailingList>
+ <name>iText Questions</name>
+ <subscribe>
+ http://lists.sourceforge.net/lists/listinfo/itext-questions
+ </subscribe>
+ <post>itext-questions at lists.sourceforge.net</post>
+ <archive>
+ http://news.gmane.org/gmane.comp.java.lib.itext.general
+ </archive>
+ <otherArchives>
+ <otherArchive>http://www.nabble.com/iText---General-f2701.html</otherArchive>
+ <otherArchive>http://www.junlu.com/2.html</otherArchive>
+ <otherArchive>http://sourceforge.net/mailarchive/forum.php?forum_id=3273</otherArchive>
+ <otherArchive>http://www.mail-archive.com/itext-questions%40lists.sourceforge.net/</otherArchive>
+ </otherArchives>
+ </mailingList>
+ </mailingLists>
+ <developers>
+ <developer>
+ <id>blowagie</id>
+ <name>Bruno Lowagie</name>
+ <email>bruno at lowagie.com</email>
+ <url>http://www.lowagie.com</url>
+ </developer>
+ <developer>
+ <id>psoares33</id>
+ <name>Paulo Soares</name>
+ <email>psoares33 at users.sourceforge.net</email>
+ </developer>
+ <developer>
+ <id>hallm</id>
+ <name>Mark Hall</name>
+ <email>hallm at users.sourceforge.net</email>
+ </developer>
+ <developer>
+ <id>xlv</id>
+ <name>Xavier Le Vourch</name>
+ <email>xlv at users.sourceforge.net</email>
+ </developer>
+ </developers>
+ <licenses>
+ <license>
+ <name>Mozilla Public License</name>
+ <url>http://www.mozilla.org/MPL/MPL-1.1.html</url>
+ <comments>
+ iText was originally published under the LGPLicense.
+ LGPL can be used as an alternative license for the MPL.
+ </comments>
+ </license>
+ </licenses>
+ <scm>
+ <connection>scm:svn:http://itext.svn.sourceforge.net/svnroot/itext</connection>
+ <url>http://itext.svn.sourceforge.net/viewvc/itext</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcmail-jdk14</artifactId>
+ <version>138</version>
+ </dependency>
+ <dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk14</artifactId>
+ <version>138</version>
+ </dependency>
+ <dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bctsp-jdk14</artifactId>
+ <version>138</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>
+ com.lowagie.tools.ToolboxAvailable
+ </mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/itext.spec b/itext.spec
index d796845..65a9716 100644
--- a/itext.spec
+++ b/itext.spec
@@ -1,10 +1,9 @@
-%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
%global alternate_name iText
Summary: A Free Java-PDF library
Name: itext
Version: 2.1.7
-Release: 16%{?dist}
+Release: 17%{?dist}
#src/toolbox/com/lowagie/toolbox/Versions.java is MPLv1.1 or MIT
#src/toolbox/com/lowagie/toolbox/plugins/XML2Bookmarks.java is MPLv1.1 or LGPLv2+
#src/rups/com/lowagie/rups/Rups.java is LGPLv2+
@@ -26,6 +25,8 @@ Source6: itext-toolbox.desktop
# cvs -d :pserver:anonymous at dev.eclipse.org:/cvsroot/tools checkout -r v2_1_7 org.eclipse.orbit/com.lowagie.text/META-INF/MANIFEST.MF
# tar cf export-manifest.tar org.eclipse.orbit/com.lowagie.text/META-INF/MANIFEST.MF
Source7: export-manifest.tar
+Source8: http://repo2.maven.org/maven2/com/lowagie/itext-rtf/%{version}/itext-rtf-%{version}.pom
+Source9: http://repo2.maven.org/maven2/com/lowagie/itext-rups/%{version}/itext-rups-%{version}.pom
Patch1: itext-2.1.5-pdftk.patch
# The iText POM specifies that it requires bouncycastle's "jdk14" JARs
@@ -65,16 +66,14 @@ BuildRequires: ImageMagick
BuildRequires: pdf-renderer
BuildRequires: java-devel >= 1.7
BuildRequires: jpackage-utils
-%if %{with_gcj}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-Requires: java-1.5.0-gcj
-%else
BuildArch: noarch
-%endif
+Requires: bouncycastle-tsp >= 1.46-4
+Requires: java >= 1.5
+Requires: jpackage-utils
+Obsoletes: itext < 2.1.7-12
Provides: %{alternate_name} == %{version}-%{release}
-Requires: %{name}-core = %{version}-%{release}
+Obsoletes: %{name}-core < %{version}-%{release}
+Provides: %{name}-core = %{version}-%{release}
%description
iText is a library that allows you to generate PDF files on the fly. The iText
@@ -84,42 +83,22 @@ especially useful in combination with Java(TM) technology-based Servlets: The
look and feel of HTML is browser dependent; with iText and PDF you can control
exactly how your servlet's output will look.
-
-%package core
-Summary: The core iText Java-PDF library
-Group: Development/Libraries
-BuildArch: noarch
-Requires: bouncycastle-tsp >= 1.46-4
-Requires: java >= 1.5
-Requires: jpackage-utils
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
-Obsoletes: itext < 2.1.7-12
-
-%description core
-The core package contains the main iText library and the related maven POM
-files.
-
-
%package rtf
Summary: Library to output Rich Text Files
Group: Development/Libraries
-BuildArch: noarch
License: MPLv1.1 or LGPLv2+
-Requires: %{name}-core = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
%description rtf
The RTF package is an extension of the iText library and allows iText to output
Rich Text Files in addition to PDF files. These files can then be viewed and
edited with RTF viewers such as OpenOffice.org Writer.
-
%package rups
Summary: Reading/Updating PDF Syntax
Group: Applications/Productivity
-BuildArch: noarch
License: LGPLv2+ and CC-BY
-Requires: %{name}-core = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Requires: dom4j
Requires: pdf-renderer
@@ -128,16 +107,13 @@ iText RUPS is a tool that combines SUN's PDF Renderer (to view PDF documents),
iText's PdfReader (to inspect the internal structure of a PDF file), and
iText's PdfStamper to manipulate a PDF file.
-
%package toolbox
Summary: Some %{alternate_name} tools
Group: Applications/Productivity
-BuildArch: noarch
License: MPLv1.1 or MIT
-Requires: %{name}-core = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Requires: java >= 1.5
-
%description toolbox
iText is a free open source Java-PDF library released on SF under the MPL/LGPL;
iText comes with a simple GUI: the iText toolbox. The original developers of
@@ -145,12 +121,10 @@ iText want to publish this toolbox as a separate project under the more
permissive MIT license. This is a utility that allows you to use a number of
iText tools.
-
%package javadoc
Summary: Javadoc for %{alternate_name}
Group: Documentation
-BuildArch: noarch
-Requires: %{name}-core = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Requires: jpackage-utils
%description javadoc
@@ -166,6 +140,18 @@ cp -pr %{SOURCE2} JPP-itext.pom
%patch4 -p0
%patch5 -p0
+cp -pr %{SOURCE8} JPP-%{name}-rtf.pom
+cp -pr %{SOURCE9} JPP-%{name}-rups.pom
+
+for p in JPP-%{name}-rtf.pom JPP-%{name}-rups.pom ; do
+%pom_remove_dep bouncycastle:bcmail-jdk14 ${p}
+%pom_add_dep org.bouncycastle:bcmail-jdk16 ${p}
+%pom_remove_dep bouncycastle:bcprov-jdk14 ${p}
+%pom_add_dep org.bouncycastle:bcprov-jdk16 ${p}
+%pom_remove_dep bouncycastle:bctsp-jdk14 ${p}
+%pom_add_dep org.bouncycastle:bctsp-jdk16 ${p}
+done
+
# move manifest to build area
tar -xf %{SOURCE7}
mv org.eclipse.orbit/com.lowagie.text/META-INF/MANIFEST.MF src/ant
@@ -210,15 +196,13 @@ popd
# jars
mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p lib/iText.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
cp -p lib/iText-rtf.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-rtf-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/%{name}-rtf.jar
cp -p lib/iText-rups.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-rups-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/%{name}-rups.jar
cp -p lib/iText-toolbox.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-toolbox-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do \
- ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+ $RPM_BUILD_ROOT%{_javadir}/%{name}-toolbox.jar
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -242,10 +226,6 @@ cp -a %{name}.png \
cp -a %{name}.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/%{name}-toolbox.png
-%if %{with_gcj}
- RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-indirect-classes" %{_bindir}/aot-compile-rpm
-%endif
-
# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr build/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -253,30 +233,12 @@ cp -pr build/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# Install the pom
install -dm 755 $RPM_BUILD_ROOT%{_mavenpomdir}
cp -pr JPP-itext.pom $RPM_BUILD_ROOT%{_mavenpomdir}
-%add_to_maven_depmap itext itext %{version} JPP itext
-%add_to_maven_depmap com.lowagie itext %{version} JPP itext
-
-%post
-%if %{with_gcj}
- if [ -x %{_bindir}/rebuild-gcj-db ]
- then
- %{_bindir}/rebuild-gcj-db
- fi
-%endif
-
-%postun
-%if %{with_gcj}
- if [ -x %{_bindir}/rebuild-gcj-db ]
- then
- %{_bindir}/rebuild-gcj-db
- fi
-%endif
-
-%post core
-%update_maven_depmap
-
-%postun core
-%update_maven_depmap
+%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "itext:itext"
+
+cp -pr JPP-%{name}-rtf.pom $RPM_BUILD_ROOT%{_mavenpomdir}
+%add_maven_depmap JPP-%{name}-rtf.pom %{name}-rtf.jar -f rtf
+cp -pr JPP-%{name}-rups.pom $RPM_BUILD_ROOT%{_mavenpomdir}
+%add_maven_depmap JPP-%{name}-rups.pom %{name}-rups.jar -f rups
%post rups
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -304,30 +266,21 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
-%if %{with_gcj}
-%dir %{_libdir}/gcj/%{name}
-%{_libdir}/gcj/%{name}/%{name}-%{version}.*
-# We only need the aot bits for the core jar
-%exclude %{_libdir}/gcj/%{name}/%{name}-rtf-%{version}.*
-%exclude %{_libdir}/gcj/%{name}/%{name}-rups-%{version}.*
-%exclude %{_libdir}/gcj/%{name}/%{name}-toolbox-%{version}.*
-%endif
-
-%files core
%doc build/bin/com/lowagie/text/{apache_license,lgpl,misc_licenses,MPL-1.1}.txt
%{_javadir}/%{name}.jar
-%{_javadir}/%{name}-%{version}.jar
%{_mavenpomdir}/JPP-itext.pom
%{_mavendepmapfragdir}/%{name}
%files rtf
%{_javadir}/%{name}-rtf.jar
-%{_javadir}/%{name}-rtf-%{version}.jar
+%{_mavenpomdir}/JPP-%{name}-rtf.pom
+%{_mavendepmapfragdir}/%{name}-rtf
%files rups
%doc src/rups/com/lowagie/rups/view/icons/copyright_notice.txt
%{_javadir}/%{name}-rups.jar
-%{_javadir}/%{name}-rups-%{version}.jar
+%{_mavenpomdir}/JPP-%{name}-rups.pom
+%{_mavendepmapfragdir}/%{name}-rups
%{_bindir}/%{name}-rups
%{_datadir}/applications/%{name}-rups.desktop
%{_datadir}/icons/hicolor/128x128/apps/%{name}-rups.png
@@ -335,17 +288,24 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files toolbox
%doc src/toolbox/com/lowagie/toolbox/tools.txt
%{_javadir}/%{name}-toolbox.jar
-%{_javadir}/%{name}-toolbox-%{version}.jar
%{_bindir}/%{name}-toolbox
%{_datadir}/applications/%{name}-toolbox.desktop
%{_datadir}/icons/hicolor/128x128/apps/%{name}-toolbox.png
%files javadoc
%{_javadocdir}/%{name}
+%doc build/bin/com/lowagie/text/{apache_license,lgpl,misc_licenses,MPL-1.1}.txt
# -----------------------------------------------------------------------------
%changelog
+* Fri Mar 01 2013 gil cattaneo <puntogil at libero.it> 2.1.7-17
+- minor changes to current guideline
+- removed gcj bits
+- added rtf and rups maven poms files (rhbz#879010)
+- fix rhbz#905993
+- fix rhbz#914094
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.7-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list