Author: qboosh Date: Fri Sep 17 19:18:49 2010 GMT Module: packages Tag: HEAD ---- Log message: - added binlink patch (fixes gsc/gsx linking); gtk subpackage is back - back to separate install/soinstall (race with make -jN)
---- Files affected: packages/ghostscript: ghostscript.spec (1.197 -> 1.198) , ghostscript-binlink.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/ghostscript/ghostscript.spec diff -u packages/ghostscript/ghostscript.spec:1.197 packages/ghostscript/ghostscript.spec:1.198 --- packages/ghostscript/ghostscript.spec:1.197 Fri Sep 17 09:07:57 2010 +++ packages/ghostscript/ghostscript.spec Fri Sep 17 21:18:43 2010 @@ -3,16 +3,11 @@ # - fix svga bcond # - add djvu driver: # http://dl.sourceforge.net/djvu/gsdjvu-1.3.tar.gz (or newer) -# - gtk package packages library as executable and bogus libgs.so.8 dep -# file usr/bin/gsx -# usr/bin/gsx: ELF 64-bit LSB shared object, x86-64, version 1 (SYSV), dynamically linked, stripped -# rpm -qp --provides ghostscript-gtk-8.71-1.x86_64.rpm -# libgs.so.8()(64bit) # # Conditional build: %bcond_without system_jbig2dec # build with included jbig2dec %bcond_with svga # svgalib display support (vgalib,lvga256 devices) [broken in sources] -%bcond_with gtk # without gsx (fix it first) +%bcond_without gtk # gsx (GTK+ based frontend) Summary: PostScript & PDF interpreter and renderer Summary(de.UTF-8): PostScript & PDF Interpreter und Renderer @@ -37,6 +32,7 @@ Patch5: %{name}-cups-sh.patch Patch6: %{name}-gdevcd8-fixes.patch Patch7: %{name}-fPIC.patch +Patch8: %{name}-binlink.patch URL: http://www.ghostscript.com/ BuildRequires: autoconf >= 2.57 BuildRequires: automake >= 1.6 @@ -45,8 +41,7 @@ BuildRequires: docbook-style-dsssl BuildRequires: fontconfig-devel %{?with_system_jbig2dec:BuildRequires: jbig2dec-devel} -# for gsx -%{?with_gtk:BuildRequires: gtk+-devel} +%{?with_gtk:BuildRequires: gtk+2-devel >= 1:2.0.0} BuildRequires: libpaper-devel BuildRequires: libpng-devel >= 1.2.42 BuildRequires: libstdc++-devel @@ -194,6 +189,7 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %build %if %{with system_jbig2dec} @@ -242,7 +238,11 @@ %install rm -rf $RPM_BUILD_ROOT -%{__make} install soinstall \ +%{__make} soinstall \ + DESTDIR=$RPM_BUILD_ROOT \ + docdir=%{_docdir}/%{name}-%{version} + +%{__make} install \ DESTDIR=$RPM_BUILD_ROOT \ docdir=%{_docdir}/%{name}-%{version} @@ -406,6 +406,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.198 2010/09/17 19:18:43 qboosh +- added binlink patch (fixes gsc/gsx linking); gtk subpackage is back +- back to separate install/soinstall (race with make -jN) + Revision 1.197 2010/09/17 07:07:57 qboosh - added fPIC patch from Fedora, no -fPIC for whole sources ================================================================ Index: packages/ghostscript/ghostscript-binlink.patch diff -u /dev/null packages/ghostscript/ghostscript-binlink.patch:1.1 --- /dev/null Fri Sep 17 21:18:49 2010 +++ packages/ghostscript/ghostscript-binlink.patch Fri Sep 17 21:18:43 2010 @@ -0,0 +1,21 @@ +--- ghostscript-8.71/base/unix-dll.mak.orig 2009-10-19 22:24:53.000000000 +0200 ++++ ghostscript-8.71/base/unix-dll.mak 2010-09-17 20:35:47.367647439 +0200 +@@ -80,15 +80,16 @@ + + $(GSSOC_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER) + $(GLCC) -g -o $(GSSOC_XE) $(PSSRC)dxmainc.c \ +- $(LDFLAGS) -L$(BINDIR) -l$(GS) ++ $(LDFLAGS_BIN) -L$(BINDIR) -l$(GS) + + $(GSSOX_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER) + $(GLCC) -g $(SOC_CFLAGS) -o $(GSSOX_XE) $(PSSRC)$(SOC_LOADER) \ +- $(LDFLAGS) -L$(BINDIR) -l$(GS) $(SOC_LIBS) ++ $(LDFLAGS_BIN) -L$(BINDIR) -l$(GS) $(SOC_LIBS) + + # ------------------------- Recursive make targets ------------------------- # + + SODEFS=LDFLAGS='$(LDFLAGS) $(LDFLAGS_SO)'\ ++ LDFLAGS_BIN='$(LDFLAGS)'\ + GS_XE=$(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR)\ + STDIO_IMPLEMENTATION=c\ + DISPLAY_DEV=$(DD)$(SOOBJRELDIR)/display.dev\ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ghostscript/ghostscript.spec?r1=1.197&r2=1.198&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
