Accepting request 347469 from Printing
Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/347469 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ghostscript?expand=0&rev=22
This commit is contained in:
commit
3502757ad9
@ -1,3 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 18 11:46:58 UTC 2015 - schwab@suse.de
|
||||
|
||||
- Do not use library sources for freetype jpeg libpng tiff zlib
|
||||
from the Ghostscript upstream tarball because we prefer to use
|
||||
for long-established standard libraries the ones from SUSE
|
||||
in particular to automatically get SUSE security updates
|
||||
for standard libraries.
|
||||
In contrast we use e.g. lcms2 from the Ghostscript upstream
|
||||
tarball because this one is specially modified to work with
|
||||
Ghostscript so that we cannot use lcms2 from SUSE.
|
||||
- remove-zlib-h-dependency.patch removes dependency on zlib/zlib.h
|
||||
in makefiles as we do not use the zlib sources from the
|
||||
Ghostscript upstream tarball.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 5 13:33:14 CET 2015 - jsmeix@suse.de
|
||||
|
||||
|
@ -18,6 +18,7 @@
|
||||
|
||||
Name: ghostscript-mini
|
||||
BuildRequires: freetype2-devel
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: libtiff-devel
|
||||
BuildRequires: libtool
|
||||
@ -84,6 +85,10 @@ Patch2: install_gserrors.h.patch
|
||||
Patch11: ppc64le-support.patch
|
||||
# Source100...Source999 is for sources from SUSE which are not intended for upstream:
|
||||
# Patch100...Patch999 is for patches from SUSE which are not intended for upstream:
|
||||
# Patch100 remove-zlib-h-dependency.patch removes dependency on zlib/zlib.h
|
||||
# in makefiles as we do not use the zlib sources from the Ghostscript upstream tarball:
|
||||
Patch100: remove-zlib-h-dependency.patch
|
||||
# RPM dependencies:
|
||||
Conflicts: ghostscript
|
||||
Conflicts: ghostscript-x11
|
||||
Conflicts: ghostscript-devel
|
||||
@ -168,6 +173,15 @@ This package contains the development files for Minimal Ghostscript.
|
||||
# but the hunk for LCMS2 (lcms2/include/lcms2.h) is still needed
|
||||
# see http://bugs.ghostscript.com/show_bug.cgi?id=695544
|
||||
%patch11 -p1 -b ppc64le-support.orig
|
||||
# Patch100 remove-zlib-h-dependency.patch removes dependency on zlib/zlib.h
|
||||
# in makefiles as we do not use the zlib sources from the Ghostscript upstream tarball:
|
||||
%patch100 -p1 -b remove-zlib-h-dependency.orig
|
||||
# Do not use the freetype jpeg libpng tiff zlib sources from the Ghostscript upstream tarball
|
||||
# because we prefer to use for long-established standard libraries the ones from SUSE
|
||||
# in particular to automatically get SUSE security updates for standard libraries.
|
||||
# In contrast we use e.g. lcms2 from the Ghostscript upstream tarball because this one
|
||||
# is specially modified to work with Ghostscript so that we cannot use lcms2 from SUSE:
|
||||
rm -rf freetype jpeg libpng tiff zlib
|
||||
|
||||
%build
|
||||
# Set our preferred architecture-specific flags for the compiler and linker:
|
||||
|
@ -1,3 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 18 11:46:58 UTC 2015 - schwab@suse.de
|
||||
|
||||
- Do not use library sources for freetype jpeg libpng tiff zlib
|
||||
from the Ghostscript upstream tarball because we prefer to use
|
||||
for long-established standard libraries the ones from SUSE
|
||||
in particular to automatically get SUSE security updates
|
||||
for standard libraries.
|
||||
In contrast we use e.g. lcms2 from the Ghostscript upstream
|
||||
tarball because this one is specially modified to work with
|
||||
Ghostscript so that we cannot use lcms2 from SUSE.
|
||||
- remove-zlib-h-dependency.patch removes dependency on zlib/zlib.h
|
||||
in makefiles as we do not use the zlib sources from the
|
||||
Ghostscript upstream tarball.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 5 13:33:14 CET 2015 - jsmeix@suse.de
|
||||
|
||||
|
@ -36,6 +36,7 @@ BuildRequires: cups-devel
|
||||
BuildRequires: dbus-1-devel
|
||||
BuildRequires: freetype2-devel
|
||||
BuildRequires: libexpat-devel
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: libtiff-devel
|
||||
BuildRequires: libtool
|
||||
@ -104,6 +105,9 @@ Patch2: install_gserrors.h.patch
|
||||
Patch11: ppc64le-support.patch
|
||||
# Source100...Source999 is for sources from SUSE which are not intended for upstream:
|
||||
# Patch100...Patch999 is for patches from SUSE which are not intended for upstream:
|
||||
# Patch100 remove-zlib-h-dependency.patch removes dependency on zlib/zlib.h
|
||||
# in makefiles as we do not use the zlib sources from the Ghostscript upstream tarball:
|
||||
Patch100: remove-zlib-h-dependency.patch
|
||||
# RPM dependencies:
|
||||
# Additional RPM Provides of the ghostscript-library packages in openSUSE 11.4 from
|
||||
# "rpm -q --provides ghostscript-library" and "rpm -q --provides ghostscript-x11":
|
||||
@ -305,6 +309,15 @@ This package contains the development files for Ghostscript.
|
||||
# but the hunk for LCMS2 (lcms2/include/lcms2.h) is still needed
|
||||
# see http://bugs.ghostscript.com/show_bug.cgi?id=695544
|
||||
%patch11 -p1 -b ppc64le-support.orig
|
||||
# Patch100 remove-zlib-h-dependency.patch removes dependency on zlib/zlib.h
|
||||
# in makefiles as we do not use the zlib sources from the Ghostscript upstream tarball:
|
||||
%patch100 -p1 -b remove-zlib-h-dependency.orig
|
||||
# Do not use the freetype jpeg libpng tiff zlib sources from the Ghostscript upstream tarball
|
||||
# because we prefer to use for long-established standard libraries the ones from SUSE
|
||||
# in particular to automatically get SUSE security updates for standard libraries.
|
||||
# In contrast we use e.g. lcms2 from the Ghostscript upstream tarball because this one
|
||||
# is specially modified to work with Ghostscript so that we cannot use lcms2 from SUSE:
|
||||
rm -rf freetype jpeg libpng tiff zlib
|
||||
|
||||
%build
|
||||
# Set our preferred architecture-specific flags for the compiler and linker:
|
||||
|
13
remove-zlib-h-dependency.patch
Normal file
13
remove-zlib-h-dependency.patch
Normal file
@ -0,0 +1,13 @@
|
||||
Index: ghostscript-9.18/base/lib.mak
|
||||
===================================================================
|
||||
--- ghostscript-9.18.orig/base/lib.mak
|
||||
+++ ghostscript-9.18/base/lib.mak
|
||||
@@ -582,7 +582,7 @@ srlx_h=$(GLSRC)srlx.h
|
||||
sstring_h=$(GLSRC)sstring.h
|
||||
strimpl_h=$(GLSRC)strimpl.h $(scommon_h) $(gstypes_h) $(gsstruct_h)
|
||||
szlibx_h=$(GLSRC)szlibx.h
|
||||
-zlib_h=$(ZSRCDIR)$(D)zlib.h
|
||||
+zlib_h= #$(ZSRCDIR)$(D)zlib.h
|
||||
# We have two of the following, for shared zlib (_1)
|
||||
# and 'local' zlib (_0)
|
||||
szlibxx_h_1=$(GLSRC)szlibxx.h $(szlibx_h)
|
Loading…
Reference in New Issue
Block a user