From 30ba988420f60a386c19d073205eecfbcc559446 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 05:18:21 +0000
Subject: [PATCH] auto-import changelog data from ghostscript-7.07-15.1.src.rpm
 Thu Jan 15 2004 Tim Waugh <twaugh@redhat.com> 7.07-15.1 - Build for Fedora
 Core 1 printer drivers update. - Turn off fontconfig. Tue Jan 06 2004 Tim
 Waugh <twaugh@redhat.com> 7.07-15 - Build for Fedora Core 1 printer drivers
 update. - Conflicts with foomatic before hpijs 1.5 data. - Make fontconfig
 optional. Sat Dec 13 2003 Tim Waugh <twaugh@redhat.com> 7.07-14 - Disable
 unnecessary debug messages from fontconfig support. Fri Dec 05 2003 Tim Waugh
 <twaugh@redhat.com> 7.07-13 - Add fontconfig support (bug #111412). Thu Nov
 27 2003 Tim Waugh <twaugh@redhat.com> - Build requires libjpeg-devel (bug
 #110737). Tue Nov 11 2003 Tim Waugh <twaugh@redhat.com> 7.07-12 - Updated
 hpijs to 1.5 (bug #109714). Mon Nov 10 2003 Tim Waugh <twaugh@redhat.com> -
 Updated lxm3200 patch (bug #109625).

---
 .cvsignore       |  4 +--
 ghostscript.spec | 73 ++++++++++++++++++++++++++++++++++++++----------
 sources          |  4 +--
 3 files changed, 62 insertions(+), 19 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index c7323aa..edc46a1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -7,7 +7,7 @@ ghostscript-7.07.tar.bz2
 gs550j1.tar.gz
 gs6.51-cjk-M2-R3.tar.gz
 gs704-j-vlib.zip
-hpijs-1.4.tar.gz
+hpijs-1.5.tar.gz
 lexmarkgs990908.tar.gz
-lxm3200-0.4.1-gs5.50-src.tar.gz
+lxm3200-tweaked-20030501.tar.gz
 pcl3-3.3.tar.gz
diff --git a/ghostscript.spec b/ghostscript.spec
index a18bddd..9b36afb 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -2,16 +2,26 @@
 Summary: A PostScript(TM) interpreter and renderer.
 Name: ghostscript
 Version: %{gs_ver}
-BuildRequires: gimp-print-devel
+BuildRequires: gimp-print-devel libjpeg-devel
 BuildRequires: patchutils >= 0.2.13
 
+# Foomatic data for hpijs 1.5 is needed
+Conflicts: foomatic < 3.0.0-14
+
 # Set this to '1' if you want to build libgs.so and gsx.
 %define build_libgs 0
 
-Release: 11
-%define hpijs 1.4
-%define hpijs_release_offset 0
-%define hpijs_release %(echo $((%{hpijs_release_offset} + %{release})) )
+# Set this to '1' for fontconfig support.
+%define use_fontconfig 0
+
+### REMEMBER TO UPDATE hpijs_release BELOW!!
+Release: 15.1
+### REMEMBER TO UPDATE hpijs_release BELOW!!
+
+%define hpijs 1.5
+%define hpijs_release_offset -11
+%define hpijs_release 4.1
+
 
 
 License: GPL
@@ -23,8 +33,8 @@ Source2: http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/pcl3-%{pcl3_ve
 %define md2k_ver 0.2a
 Source3: http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/gdevmd2k-%{md2k_ver}.tar.gz
 Source4: http://lcewww.et.tudelft.nl/~haver/cgi-bin/download/linux/epson740.tgz
-%define lxm_ver 0.4.1-gs5.50
-Source6: http://www.geocities.com/dgordini/lxm3200-%{lxm_ver}-src.tar.gz
+%define lxm_ver tweaked-20030501
+Source6: http://www.linuxprinting.org/download/printing/lxm3200-%{lxm_ver}.tar.gz
 Source7: http://www.powerup.com.au/~pbwest/lexmark/gdevlx50.c
 Source8: ftp://bimbo.fjfi.cvut.cz/users/paluch/lexmarkgs/lexmarkgs990908.tar.gz
 # Url for gs-cjk project, the source of Source9:
@@ -80,8 +90,10 @@ Patch36: ghostscript-7.07-bigposttable.patch
 Patch37: ghostscript-7.07-gsublookuptable.patch
 Patch38: ghostscript-7.07-coverage-glyphcount.patch
 Patch39: hpijs-compile.patch
-Patch40: ghostscript-7.05-lips4v-fix-pipe.patch
-Patch41: ghostscript-7.05-cups.patch
+Patch40: hpijs-flags.patch
+Patch41: ghostscript-7.05-lips4v-fix-pipe.patch
+Patch42: ghostscript-7.05-cups.patch
+Patch43: ghostscript-7.07-fontconfig-rh.patch
 
 Requires: VFlib2, zlib, libpng, glib
 Requires: urw-fonts >= 1.1, ghostscript-fonts
@@ -324,7 +336,7 @@ PhotoSmart, DeskJet 990C and PhotoSmart 100 series.
 
 # Add Daniel Gordini's lxm3200 driver
 	tar xzf %{SOURCE6}
-	mv lxm3200-%{lxm_ver}-src/*.[ch] src/
+	mv lxm3200-%{lxm_ver}/*.[ch] src/
 
 	# update the make files
 	GS_DEVS=$GS_DEVS'$(DD)lxm3200.dev '
@@ -488,12 +500,18 @@ $(GLOBJ)gdevcups.$(OBJ): $(GLSRC)gdevcups.c $(PDEVH)
 
 pushd hpijs-%{hpijs}
 %patch39 -p1 -b .compile
+%patch40 -p1 -b .hpijsflags
 popd
 
-%patch40 -p1 -b .lips4v-fix-pipe
+%patch41 -p1 -b .lips4v-fix-pipe
 
 # Apply patch from CUPS for media attrs
-%patch41 -p1 -b .cups
+%patch42 -p1 -b .cups
+
+# Add fontconfig support (bug #111412).
+%if %{use_fontconfig}
+%patch43 -p1 -b .fontconfig-rh
+%endif
 
 # Set up for a unix os, gcc compiler build, and replace our insertion string
 sed -e "s/_XXX_RPM_GS_DEVICES_XXX_/$GS_DEVS/;" src/unix-gcc.mak > Makefile
@@ -527,10 +545,11 @@ make so RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix}
 %endif
 
 # Build the HP IJS server
-cd hpijs-%{hpijs}
-%configure --disable-cups-install --disable-foomatic-install
+pushd hpijs-%{hpijs}
+%configure --disable-cups-install --disable-foomatic-install \
+	RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
 make
-cd ..
+popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -636,6 +655,30 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libijs.a
 
 %changelog
+* Thu Jan 15 2004 Tim Waugh <twaugh@redhat.com> 7.07-15.1
+- Build for Fedora Core 1 printer drivers update.
+- Turn off fontconfig.
+
+* Tue Jan 6  2004 Tim Waugh <twaugh@redhat.com> 7.07-15
+- Build for Fedora Core 1 printer drivers update.
+- Conflicts with foomatic before hpijs 1.5 data.
+- Make fontconfig optional.
+
+* Sat Dec 13 2003 Tim Waugh <twaugh@redhat.com> 7.07-14
+- Disable unnecessary debug messages from fontconfig support.
+
+* Fri Dec  5 2003 Tim Waugh <twaugh@redhat.com> 7.07-13
+- Add fontconfig support (bug #111412).
+
+* Thu Nov 27 2003 Tim Waugh <twaugh@redhat.com>
+- Build requires libjpeg-devel (bug #110737).
+
+* Tue Nov 11 2003 Tim Waugh <twaugh@redhat.com> 7.07-12
+- Updated hpijs to 1.5 (bug #109714).
+
+* Mon Nov 10 2003 Tim Waugh <twaugh@redhat.com>
+- Updated lxm3200 patch (bug #109625).
+
 * Tue Sep 30 2003 Tim Waugh <twaugh@redhat.com> 7.07-11
 - Updated gdevcups.c from CUPS 1.1.19.
 - Apply NOMEDIAATTRS patch from CUPS 1.1.19 (bug #105401).
diff --git a/sources b/sources
index 18dfa95..bccbfe2 100644
--- a/sources
+++ b/sources
@@ -7,7 +7,7 @@ e8fbffadb8d70ce5f92708a699ae7765  adobe-cmaps-200202.tar.gz
 d202cd105c496b7f0eb5221316fb7b7f  gs550j1.tar.gz
 6f8e90effe12527a4c3b36ea4ce47b3c  gs6.51-cjk-M2-R3.tar.gz
 b32da7d61421384a0874037576033861  gs704-j-vlib.zip
-430f9b20bfe31e0f7f343fe9595904f3  hpijs-1.4.tar.gz
+348bbc20f42b9d7dae4b08590649098b  hpijs-1.5.tar.gz
 aea08da4e37ab68ed6f1dc451f24b30b  lexmarkgs990908.tar.gz
-ec11b9ef72ecaabb61eeba27e93f9f2b  lxm3200-0.4.1-gs5.50-src.tar.gz
+0f88082030c6eb66a95804a6cc9b9e6b  lxm3200-tweaked-20030501.tar.gz
 34e664c2a98b847598f8441f8cac7ab6  pcl3-3.3.tar.gz