From 9e5f137b6a681fb9a1bd06c6ed11db6724e912d9 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Wed, 25 Sep 2013 15:57:11 +0100 Subject: [PATCH] Regenerate tarball (bug #1000387). Resolves: rhbz#1000387 --- .gitignore | 1 + generate-tarball.sh | 8 ++++++++ ghostscript.spec | 12 ++++++++++-- sources | 2 +- 4 files changed, 20 insertions(+), 3 deletions(-) create mode 100755 generate-tarball.sh diff --git a/.gitignore b/.gitignore index db6db1d..94054fd 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ ghostscript-8.71.tar.xz /ghostscript-9.04.tar.bz2 /ghostscript-9.05.tar.bz2 /ghostscript-9.06.tar.bz2 +/ghostscript-9.06-cleaned.tar.bz2 diff --git a/generate-tarball.sh b/generate-tarball.sh new file mode 100755 index 0000000..61f3f62 --- /dev/null +++ b/generate-tarball.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +VERSION=$1 + +rm -rf ghostscript-$VERSION +tar jxvf ghostscript-$VERSION.tar.bz2 +rm -r ghostscript-$VERSION/jpegxr +tar jcvf ghostscript-$VERSION-cleaned.tar.bz2 ghostscript-$VERSION diff --git a/ghostscript.spec b/ghostscript.spec index 759ce09..d2d0ffa 100644 --- a/ghostscript.spec +++ b/ghostscript.spec @@ -5,14 +5,19 @@ Summary: A PostScript interpreter and renderer Name: ghostscript Version: %{gs_ver} -Release: 7%{?dist} +Release: 8%{?dist} # Included CMap data is Redistributable, no modification permitted, # see http://bugzilla.redhat.com/487510 License: GPLv3+ and Redistributable, no modification permitted URL: http://www.ghostscript.com/ Group: Applications/Publishing -Source0: http://downloads.ghostscript.com/public/ghostscript-%{gs_ver}.tar.bz2 +Source0: ghostscript-%{gs_ver}-cleaned.tar.bz2 +# ghostscript contains a jpegxr directory containing code we cannot +# ship due to licensing concerns. Therefore we use this script to +# remove that directory before shipping it. Download the upstream +# tarball and invoke this script while in the tarball's directory: +Source1: generate-tarball.sh Source2: CIDFnmap Source4: cidfmap @@ -343,6 +348,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libgs.so %changelog +* Wed Sep 25 2013 Tim Waugh 9.06-8 +- Regenerate tarball (bug #1000387). + * Wed Aug 28 2013 Tim Waugh 9.06-7 - Remove jpegxr to ensure it isn't built (bug #1000387). diff --git a/sources b/sources index 4ce38f1..ff42fb9 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 2fbae60417d42779f6488ab897dcaaf6 acro5-cmaps-2001.tar.gz dfc93dd2aaaf2b86d2fd55f654c13261 adobe-cmaps-200406.tar.gz -46f9ebe40dc52755287b30704270db11 ghostscript-9.06.tar.bz2 +b3837fdc6c25b5edb56863a4182978eb ghostscript-9.06-cleaned.tar.bz2