diff --git a/.gitignore b/.gitignore index b99de81..ab84514 100644 --- a/.gitignore +++ b/.gitignore @@ -32,9 +32,12 @@ 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 /ghostscript-9.07.tar.bz2 +/ghostscript-9.07-cleaned.tar.bz2 /ghostscript-9.08rc1.tar.gz /ghostscript-9.08.tar.bz2 /ghostscript-9.09rc1.tar.gz /ghostscript-9.09.tar.bz2 /ghostscript-9.10.tar.bz2 +/ghostscript-9.10-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 5d945c5..55ddff0 100644 --- a/ghostscript.spec +++ b/ghostscript.spec @@ -5,14 +5,19 @@ Summary: A PostScript interpreter and renderer Name: ghostscript Version: %{gs_ver} -Release: 1%{?dist} +Release: 4%{?dist} # Included CMap data is Redistributable, no modification permitted, # see http://bugzilla.redhat.com/487510 License: AGPLv3+ 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 @@ -315,8 +320,8 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libgs.so %changelog -* Mon Sep 9 2013 Tim Waugh 9.10-1 -- 9.10. +* Wed Sep 25 2013 Tim Waugh 9.09-4 +- Regenerate tarball (bug #1000387). * Wed Aug 28 2013 Tim Waugh 9.09-3 - Remove jpegxr to ensure it isn't built (bug #1000387). diff --git a/sources b/sources index 56ac832..62c6218 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ 2fbae60417d42779f6488ab897dcaaf6 acro5-cmaps-2001.tar.gz dfc93dd2aaaf2b86d2fd55f654c13261 adobe-cmaps-200406.tar.gz -7179bb1ed4f6f453147e6f7e1f210ce8 ghostscript-9.10.tar.bz2 +b8756554357debc6b72b3d85674a4084 ghostscript-9.07-cleaned.tar.bz2 +2ace0c86929e79dc722ec6151de77db1 ghostscript-9.10-cleaned.tar.bz2