diff --git a/.gitignore b/.gitignore index 4615f44..9fde9e9 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ ghostscript-8.71.tar.xz /ghostscript-9.10-cleaned.tar.bz2 /ghostscript-9.12-cleaned.tar.bz2 /ghostscript-9.14-cleaned.tar.bz2 +/ghostscript-9.14-cleaned-1.tar.bz2 diff --git a/generate-tarball.sh b/generate-tarball.sh index 3a981f8..911d67d 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -4,5 +4,23 @@ 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" + +GS=ghostscript-"$VERSION" + +# License unclear (bug #1000387). +rm -r "$GS"/jpegxr + +# License unknown (bug #1149617). +## Documentation +rm -f "$GS"/contrib/japanese/doc/djgpp.txt +rm -f "$GS"/contrib/japanese/doc/gdevmag.txt +rm -f "$GS"/contrib/japanese/doc/gs261j.* +## Example code +rm -f "$GS"/examples/chess.ps +## %ram% IODevice +rm -f "$GS"/base/gsioram.c +rm -f "$GS"/base/ramfs.c +rm -f "$GS"/base/ramfs.h +sed -i -e 's, $(GLD)ramfs.dev,,' "$GS"/Makefile.in "$GS"/psi/msvc.mak + +tar jcvf ghostscript-"$VERSION"-cleaned-1.tar.bz2 "$GS" diff --git a/ghostscript.spec b/ghostscript.spec index 68c087c..a6cc6d9 100644 --- a/ghostscript.spec +++ b/ghostscript.spec @@ -5,18 +5,19 @@ Summary: A PostScript interpreter and renderer Name: ghostscript Version: %{gs_ver} -Release: 4%{?dist} +Release: 5%{?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: 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: +Source0: ghostscript-%{gs_ver}-cleaned-1.tar.bz2 +# ghostscript contains code we cannot ship due to licensing concerns. +# Therefore we use this script to remove it before shipping the +# tarball. +# Download the upstream tarball and invoke this script while in the +# tarball's directory: Source1: generate-tarball.sh Source2: CIDFnmap Source4: cidfmap @@ -337,6 +338,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libgs.so %changelog +* Tue Oct 7 2014 Tim Waugh 9.14-5 +- Avoid shipping ramfs source as its license is unclear. Similarly + with some documentation and example code (bug #1149617). + * Fri Aug 15 2014 Tim Waugh 9.14-4 - Fix double-to-string conversion on e.g. ppc64 (bug #1014772). diff --git a/sources b/sources index 379d980..803508c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 2fbae60417d42779f6488ab897dcaaf6 acro5-cmaps-2001.tar.gz dfc93dd2aaaf2b86d2fd55f654c13261 adobe-cmaps-200406.tar.gz -20880993fe6f8745ffa029215fb1d474 ghostscript-9.14-cleaned.tar.bz2 +9f52809b19afa78dd25d6f9378184e69 ghostscript-9.14-cleaned-1.tar.bz2