Merge branch 'f21'

This commit is contained in:
Tim Waugh 2014-10-07 15:36:53 +01:00
commit 956b783e71
4 changed files with 37 additions and 12 deletions

2
.gitignore vendored
View File

@ -43,4 +43,6 @@ 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
/ghostscript-9.15-cleaned.tar.bz2
/ghostscript-9.15-cleaned-1.tar.bz2

View File

@ -1,8 +1,26 @@
#!/bin/sh
VERSION=$1
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
rm -rf ghostscript-"$VERSION"
tar jxvf ghostscript-"$VERSION".tar.bz2
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"

View File

@ -5,18 +5,19 @@ Summary: A PostScript interpreter and renderer
Name: ghostscript
Version: %{gs_ver}
Release: 2%{?dist}
Release: 3%{?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
@ -316,6 +317,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libgs.so
%changelog
* Tue Oct 7 2014 Tim Waugh <twaugh@redhat.com> 9.15-3
- Avoid shipping ramfs source as its license is unclear. Similarly
with some documentation and example code (bug #1149617).
* Fri Oct 3 2014 Tim Waugh <twaugh@redhat.com> 9.15-2
- Use system openjpeg2 library so we can decode JPX (upstream
bug #695557).

View File

@ -1,3 +1,3 @@
2fbae60417d42779f6488ab897dcaaf6 acro5-cmaps-2001.tar.gz
dfc93dd2aaaf2b86d2fd55f654c13261 adobe-cmaps-200406.tar.gz
9fec54ad60a6c6358257d591312df039 ghostscript-9.15-cleaned.tar.bz2
e5d0ff80508012be172dcd32d97e243e ghostscript-9.15-cleaned-1.tar.bz2