Attachment 536430 Details for Bug 757211 – Git patch for manifest change.

[patch] Git patch for manifest change.

export-manifest.patch (text/plain), 2.78 KB, created by Andrew Robinson on 2011-11-25 20:50:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Robinson

Created: 2011-11-25 20:50:44 UTC

Size: 2.78 KB

patch

obsolete

>diff --git a/.gitignore b/.gitignore
>index 21724ea..080a31b 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -1 +1,2 @@
> iText-src-2.1.7.tar.gz
>+export-manifest.tar
>diff --git a/itext.spec b/itext.spec
>index 5fe146c..4974966 100644
>--- a/itext.spec
>+++ b/itext.spec
>@@ -4,7 +4,7 @@
> Summary:          A Free Java-PDF library
> Name:             itext
> Version:          2.1.7
>-Release:          7%{?dist}
>+Release:          8%{?dist}
> License:          (LGPLv2+ or MPLv1.1) and ASL 2.0 and BSD and LGPLv2+
> URL:              http://www.lowagie.com/iText/
> Group:            Development/Libraries
>@@ -14,6 +14,9 @@ Source3:          itext-rups.sh
> Source4:          itext-rups.desktop
> Source5:          itext-toolbox.sh
> Source6:          itext-toolbox.desktop
>+# cvs -d :pserver:anonymous@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
> Patch1:           itext-2.1.5-pdftk.patch
> 
> # The iText POM specifies that it requires bouncycastle's "jdk14" JARs
>@@ -41,6 +44,8 @@ Patch2:           itext-2.1.7-fixpomforbc.patch
> # [2]
> # https://bugzilla.redhat.com/show_bug.cgi?id=236309
> Patch3:           itext-xmloutput.patch
>+# Use orbit manifest so the manifest exports packages properly.
>+Patch4:           itext-manifest.patch
> 
> BuildRequires:    ant
> BuildRequires:    bouncycastle-tsp
>@@ -133,6 +138,11 @@ API documentation for the %{alternate_name} package.
> cp -pr %{SOURCE2} JPP-itext.pom
> %patch2 -p0 -b .fixpomforbc
> %patch3 -p0 -b .xmloutput
>+%patch4 -p0
>+
>+# move manifest to build area
>+tar -xf %{SOURCE7}
>+mv org.eclipse.orbit/com.lowagie.text/META-INF/MANIFEST.MF src/ant
> 
> # Remove preshipped binaries
> find . -name "*.jar" -exec rm {} \;
>@@ -152,9 +162,6 @@ for file in src/ant/{*,.ant*}; do
>  done
> done
> 
>-# Remove classpath elements from manifest
>-sed -i '\|Class-Path|d' src/ant/compile.xml
>-
> # Setting debug="on" on javac part of the build script.
> sed -i 's|destdir|debug="on" destdir|g' src/ant/compile.xml
> sed -i 's|debug="true"||g' src/ant/compile.xml
>@@ -314,6 +321,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
> # -----------------------------------------------------------------------------
> 
> %changelog
>+* Fri Nov 25 2011 Andrew Robinson <arobinso@redhat.com> 2.1.7-8
>+- Add orbit manifest so manifest lists package exports correctly.
>+
> * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.7-7
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
> 
>diff --git a/sources b/sources
>index 46d821b..fd5c2cc 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1,2 @@
> 38c3d47e0f0a87a8151b5b2f208b461e  iText-src-2.1.7.tar.gz
>+bd8e9b024b7fe3e9754514f9701260c4  export-manifest.tar

Actions: View | Diff

Attachments on bug 757211: 536430