rpms/ghostscript/F-8 .cvsignore, 1.26, 1.27 ghostscript.spec, 1.163, 1.164 sources, 1.31, 1.32 ghostscript-incomplete-ccittfax.patch, 1.1, NONE ghostscript-r8591.patch, 1.1, NONE

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/ghostscript/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16584

Modified Files:
	.cvsignore ghostscript.spec sources 
Removed Files:
	ghostscript-incomplete-ccittfax.patch ghostscript-r8591.patch 
Log Message:
* Wed Aug 27 2008 Tim Waugh <twaugh at redhat.com>
- 8.63.  No longer need r8591 or incomplete-ccittfax patches.
- Compile without strict aliasing opts due to warnings across several
  files.
- Don't run autogen.sh for main package, just for ijs which doesn't
  ship with a configure script.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/F-8/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	4 Mar 2008 12:24:49 -0000	1.26
+++ .cvsignore	27 Aug 2008 11:07:20 -0000	1.27
@@ -22,3 +22,4 @@
 ghostscript-8.60.tar.bz2
 ghostscript-8.61.tar.bz2
 ghostscript-8.62.tar.bz2
+ghostscript-8.63.tar.bz2


Index: ghostscript.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/F-8/ghostscript.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- ghostscript.spec	27 Aug 2008 10:52:05 -0000	1.163
+++ ghostscript.spec	27 Aug 2008 11:07:20 -0000	1.164
@@ -1,11 +1,11 @@
-%define gs_ver 8.62
-%define gs_dot_ver 8.62
+%define gs_ver 8.63
+%define gs_dot_ver 8.63
 %{expand: %%define build_with_freetype %{?_with_freetype:1}%{!?_with_freetype:0}}
 Summary: A PostScript(TM) interpreter and renderer.
 Name: ghostscript
 Version: %{gs_ver}
 
-Release: 4%{?dist}
+Release: 1%{?dist}
 
 License: GPLv2
 URL: http://www.ghostscript.com/
@@ -21,8 +21,6 @@
 Patch5: ghostscript-runlibfileifexists.patch
 Patch6: ghostscript-system-jasper.patch
 Patch7: ghostscript-pksmraw.patch
-Patch8: ghostscript-r8591.patch
-Patch9: ghostscript-incomplete-ccittfax.patch
 
 Requires: urw-fonts >= 1.1, ghostscript-fonts
 BuildRequires: libjpeg-devel, libXt-devel
@@ -95,15 +93,9 @@
 
 %patch6 -p1 -b .system-jasper
 
-# Fix pksmraw output (bug #308211).
+# Fix pksmraw output (bug #308211).  Still needed in 8.63.
 %patch7 -p1 -b .pksmraw
 
-# Applied patch from upstream to fix box_fill_path for shfill (bug #452348).
-%patch8 -p1 -b .r8591
-
-# Applied patch to work around bug #229174.
-%patch9 -p1 -b .incomplete-ccittfax
-
 # Convert manual pages to UTF-8
 from8859_1() {
 	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -111,14 +103,18 @@
 }
 for i in man/de/*.1; do from8859_1 "$i"; done
 
-if [ -x autogen.sh ]; then
-  ./autogen.sh
-  pushd ijs
-  ./autogen.sh
-  popd
-fi
-
 %build
+# Compile without strict aliasing opts due to these files:
+# gdevescv.c gdevl4v.c gdevopvp.c gdevbbox.c gdevdbit.c gdevddrw.c 
+# gdevp14.c gdevpdfd.c gdevpdfi.c gdevpdfo.c gdevpdft.c gdevpdfv.c 
+# gdevpdte.c gdevpdtt.c gdevps.c gdevpx.c gscoord.c gscparam.c gscrd.c 
+# gsdps1.c gsimage.c gspath1.c gsptype1.c gsptype2.c gstype2.c 
+# gstype42.c gxccache.c gxchar.c gxclimag.c gxclpath.c gxfcopy.c 
+# gximag3x.c gximage3.c gxipixel.c gxshade1.c gxstroke.c gxtype1.c 
+# ibnum.c iscanbin.c zchar1.c zchar.c zcharx.c zfapi.c zfont32.c 
+# zfunc0.c zfunc3.c zfunc4.c zpcolor.c zshade.c
+EXTRACFLAGS="-fno-strict-aliasing"
+
 FONTPATH=
 for path in \
 	%{_datadir}/fonts/default/%{name} \
@@ -133,24 +129,25 @@
   FONTPATH="$FONTPATH${FONTPATH:+:}$path"
 done
 %configure --with-ijs --enable-dynamic --with-fontpath="$FONTPATH" \
-	--with-drivers=ALL --disable-compile-inits
+	--with-drivers=ALL --disable-compile-inits \
+	CFLAGS="$CFLAGS $EXTRACFLAGS"
 
 # Build IJS
 cd ijs
-automake --add-missing --copy || : # Ships with broken symlinks
+./autogen.sh
 %configure --enable-shared --enable-static
 make
 cd ..
 
 %if %{build_with_freetype}
 FT_CFLAGS=$(pkg-config --cflags freetype2)
-make so RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix} \
+make so RPM_OPT_FLAGS="$RPM_OPT_FLAGS $EXTRAFLAGS" prefix=%{_prefix} \
 	FT_BRIDGE=1 FT_CFLAGS="$FT_CFLAGS" FT_LIB=freetype
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix} \
+make RPM_OPT_FLAGS="$RPM_OPT_FLAGS $EXTRAFLAGS" prefix=%{_prefix} \
 	FT_BRIDGE=1 FT_CFLAGS="$FT_CFLAGS" FT_LIB=freetype
 %else
-make so RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix}
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix}
+make so RPM_OPT_FLAGS="$RPM_OPT_FLAGS $EXTRAFLAGS" prefix=%{_prefix}
+make RPM_OPT_FLAGS="$RPM_OPT_FLAGS $EXTRAFLAGS" prefix=%{_prefix}
 %endif
 
 %install
@@ -278,6 +275,11 @@
 
 %changelog
 * Wed Aug 27 2008 Tim Waugh <twaugh at redhat.com>
+- 8.63.  No longer need r8591 or incomplete-ccittfax patches.
+- Compile without strict aliasing opts due to warnings across several
+  files.
+- Don't run autogen.sh for main package, just for ijs which doesn't
+  ship with a configure script.
 - Really build with jasper (bug #433897).
 
 * Mon Jun 23 2008 Tim Waugh <twaugh at redhat.com> 8.62-4


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ghostscript/F-8/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	4 Mar 2008 12:24:49 -0000	1.31
+++ sources	27 Aug 2008 11:07:20 -0000	1.32
@@ -1,3 +1,3 @@
 2fbae60417d42779f6488ab897dcaaf6  acro5-cmaps-2001.tar.gz
 dfc93dd2aaaf2b86d2fd55f654c13261  adobe-cmaps-200406.tar.gz
-40d673a3c6e11d2bf14f972b84551104  ghostscript-8.62.tar.bz2
+c770eedfdd846a53e211e3ba5339de21  ghostscript-8.63.tar.bz2


--- ghostscript-incomplete-ccittfax.patch DELETED ---


--- ghostscript-r8591.patch DELETED ---