From 181cea6580199e5f761a6034274d860cf91955d8 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 05:19:11 +0000 Subject: [PATCH] auto-import ghostscript-7.07-19 from ghostscript-7.07-19.src.rpm --- .cvsignore | 1 - ghostscript.spec | 130 ++++++++++------------------------------------- sources | 1 - 3 files changed, 27 insertions(+), 105 deletions(-) diff --git a/.cvsignore b/.cvsignore index edc46a1..5e4f19e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -7,7 +7,6 @@ ghostscript-7.07.tar.bz2 gs550j1.tar.gz gs6.51-cjk-M2-R3.tar.gz gs704-j-vlib.zip -hpijs-1.5.tar.gz lexmarkgs990908.tar.gz lxm3200-tweaked-20030501.tar.gz pcl3-3.3.tar.gz diff --git a/ghostscript.spec b/ghostscript.spec index 078c237..fa055d6 100644 --- a/ghostscript.spec +++ b/ghostscript.spec @@ -2,27 +2,13 @@ Summary: A PostScript(TM) interpreter and renderer. Name: ghostscript Version: %{gs_ver} -BuildRequires: gimp-print-devel libjpeg-devel +BuildRequires: 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 1 - # Set this to '1' for fontconfig support. -%define use_fontconfig 0 - -### REMEMBER TO UPDATE hpijs_release BELOW!! -Release: 15.4 -### REMEMBER TO UPDATE hpijs_release BELOW!! - -%define hpijs 1.5 -%define hpijs_release_offset -11 -%define hpijs_release 4.4 - +%define use_fontconfig 1 +Release: 19 License: GPL URL: http://www.ghostscript.com/doc/gnu/ @@ -41,8 +27,6 @@ Source8: ftp://bimbo.fjfi.cvut.cz/users/paluch/lexmarkgs/lexmarkgs990908.tar.gz # http://www.gyve.org/gs-cjk/ %define cjk_ver 6.51-cjk-M2-R3 Source9: ftp://ftp.gyve.org/pub/gs-cjk/M2/gs%{cjk_ver}.tar.gz -# HP Ink Jet Server -Source10: http://prdownloads.sf.net/hpinkjet/hpijs-%{hpijs}.tar.gz # The CJK patch is for an older version of ghostscript; some patches don't # apply cleanly to the current one. Fixed versions here... Source100: lib_gs_cidcm.ps.patch @@ -89,12 +73,11 @@ Patch35: ghostscript-7.07-ps2epsi.patch Patch36: ghostscript-7.07-bigposttable.patch Patch37: ghostscript-7.07-gsublookuptable.patch Patch38: ghostscript-7.07-coverage-glyphcount.patch -Patch39: hpijs-compile.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 -Patch44: ghostscript-bjc250gs.patch +Patch43: ghostscript-7.07-badc.patch +Patch44: ghostscript-7.07-fontconfig-rh.patch +Patch45: gdevcups-crash.patch Requires: VFlib2, zlib, libpng, glib Requires: urw-fonts >= 1.1, ghostscript-fonts @@ -112,9 +95,6 @@ Conflicts: ttfonts-ko < 1.0.11-27 Conflicts: ttfonts-zh_CN < 2.12-2 Conflicts: ttfonts-zh_TW < 2.11-20 -# We shipped this in Red Hat Linux 8.0. -Obsoletes: ghostscript-gtk < %{version}-%{release} - %description Ghostscript is a set of software that provides a PostScript(TM) interpreter, a set of C procedures (the Ghostscript library, which @@ -138,7 +118,6 @@ Group: Development/Libraries %description devel The header files for developing applications that use ghostscript. -%if %{build_libgs} %package gtk Summary: A GTK-enabled PostScript(TM) interpreter and renderer. Requires: %{name} = %{version} @@ -146,23 +125,9 @@ Group: Applications/Publishing %description gtk A GTK-enabled version of Ghostscript, called 'gsx'. -%endif - -%package -n hpijs -Version: %{hpijs} -Release: %{hpijs_release} -Summary: HP Printer Drivers -Requires: %{name} -Group: Applications/Publishing - -%description -n hpijs -hpijs is a collection of optimized drivers for HP printers. -hpijs supports the DeskJet 350C, 600C, 600C Photo, 630C, Apollo 2000, -Apollo 2100, Apollo 2560, DeskJet 800C, DeskJet 825, DeskJet 900, -PhotoSmart, DeskJet 990C and PhotoSmart 100 series. %prep -%setup -q -a 10 +%setup -q # Apply the gs-cjk patches tar xzf %{SOURCE9} @@ -330,11 +295,6 @@ PhotoSmart, DeskJet 990C and PhotoSmart 100 series. mv epson740/*.upp lib/ -# Add the gimp-print stp driver - # update the make files - GS_DEVS=$GS_DEVS'$(DD)stp.dev ' - - # Add Daniel Gordini's lxm3200 driver tar xzf %{SOURCE6} mv lxm3200-%{lxm_ver}/*.[ch] src/ @@ -499,25 +459,19 @@ $(GLOBJ)gdevcups.$(OBJ): $(GLSRC)gdevcups.c $(PDEVH) %patch37 -p1 -b .gsublookuptable %patch38 -p1 -b .coverage-glyphcount -pushd hpijs-%{hpijs} -%patch39 -p1 -b .compile -%patch40 -p1 -b .hpijsflags -popd - %patch41 -p1 -b .lips4v-fix-pipe # Apply patch from CUPS for media attrs %patch42 -p1 -b .cups +%patch43 -p1 -b .badc + # Add fontconfig support (bug #111412). %if %{use_fontconfig} -%patch43 -p1 -b .fontconfig-rh +%patch44 -p1 -b .fontconfig-rh %endif -# Add bjc250gs driver -%patch44 -p1 -b .bjc250gs - GS_DEVS=$GS_DEVS'$(DD)bjcmono.dev $(DD)bjcgray.dev ' - GS_DEVS=$GS_DEVS'$(DD)bjccmyk.dev $(DD)bjccolor.dev ' +%patch45 -p1 -b .gdevcups-crash # 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 @@ -544,18 +498,7 @@ autoconf # The shipped configure script is broken and needs remaking. make cd .. -make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix} - -%if %{build_libgs} make so RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix} -%endif - -# Build the HP IJS server -pushd hpijs-%{hpijs} -%configure --disable-cups-install --disable-foomatic-install \ - RPM_OPT_FLAGS="$RPM_OPT_FLAGS" -make -popd %install rm -rf $RPM_BUILD_ROOT @@ -563,27 +506,14 @@ mkdir -p $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/{%{_mandir},%{_bindir},%{_datadir},%{_docdir}} mkdir -p $RPM_BUILD_ROOT/{%{_libdir},%{_includedir}/ijs} -make install \ +make install soinstall \ prefix=$RPM_BUILD_ROOT%{_prefix} \ mandir=$RPM_BUILD_ROOT%{_mandir} \ datadir=$RPM_BUILD_ROOT%{_datadir} \ bindir=$RPM_BUILD_ROOT%{_bindir} \ libdir=$RPM_BUILD_ROOT%{_libdir} \ docdir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{gs_ver} - -%if %{build_libgs} -make soinstall \ - prefix=$RPM_BUILD_ROOT%{_prefix} \ - mandir=$RPM_BUILD_ROOT%{_mandir} \ - datadir=$RPM_BUILD_ROOT%{_datadir} \ - bindir=$RPM_BUILD_ROOT%{_bindir} \ - libdir=$RPM_BUILD_ROOT%{_libdir} \ - docdir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{gs_ver} -%endif - -cd hpijs-%{hpijs} -make install DESTDIR=$RPM_BUILD_ROOT -cd .. +mv -f $RPM_BUILD_ROOT%{_bindir}/gsc $RPM_BUILD_ROOT%{_bindir}/gs cd ijs %makeinstall @@ -615,9 +545,7 @@ MAIN_PWD=`pwd` find .%{_bindir}/ | sed -e 's/\.//;' | \ grep -v '/$\|/hpijs$\|/gsx$\|/ijs-config$' \ >> $MAIN_PWD/rpm.sharelist) -%if %{build_libgs} echo /usr/bin/gsx >> $MAIN_PWD/rpm.sharelist -%endif %clean rm -rf $RPM_BUILD_ROOT @@ -634,22 +562,13 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/ghostscript/%{gs_ver}/examples %{_mandir}/*/* %doc %{_docdir}/%{name}-%{gs_ver} -%if %{build_libgs} %{_libdir}/libgs.so.* %{_libdir}/libgs.so -%endif %{_libdir}/libijs.so* -%if %{build_libgs} %files gtk %defattr(-,root,root) %{_bindir}/gsx -%endif - -%files -n hpijs -%defattr(-,root,root) -%{_bindir}/hpijs -%{_docdir}/hpijs-%{hpijs} %files devel %defattr(-,root,root) @@ -661,18 +580,23 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libijs.a %changelog -* Tue Aug 17 2004 Tim Waugh 7.07-15.4 -- Rebuilt. +* Wed Jan 28 2004 Tim Waugh 7.07-19 +- Attempt to fix gdevcups crash (bug #114256). +- Make gs dynamically link to libgs (bug #114276). +- Fix gdevesmv.c's misuse of const (bug #114250). -* Wed Aug 4 2004 Tim Waugh 7.07-15.3 -- Turn on libgs (bug #129062). +* Tue Jan 20 2004 Tim Waugh 7.07-18 +- Turn on libgs again (bug #88175). -* Tue Mar 9 2004 Tim Waugh 7.07-15.2 -- Added bjc250gs driver (bug #117860). +* Mon Jan 19 2004 Tim Waugh 7.07-17 +- Removed stp driver. Use the IJS version (ijsgimpprint) instead. +- No longer conflicts with foomatic for hpijs versioning. -* Thu Jan 15 2004 Tim Waugh 7.07-15.1 -- Build for Fedora Core 1 printer drivers update. -- Turn off fontconfig. +* Mon Jan 12 2004 Tim Waugh 7.07-16 +- Split hpijs out into separate source package. + +* Thu Jan 8 2004 Tim Waugh +- Fix several mistakenly-used bitwise operations. * Tue Jan 6 2004 Tim Waugh 7.07-15 - Build for Fedora Core 1 printer drivers update. diff --git a/sources b/sources index bccbfe2..8014ac8 100644 --- a/sources +++ b/sources @@ -7,7 +7,6 @@ e8fbffadb8d70ce5f92708a699ae7765 adobe-cmaps-200202.tar.gz d202cd105c496b7f0eb5221316fb7b7f gs550j1.tar.gz 6f8e90effe12527a4c3b36ea4ce47b3c gs6.51-cjk-M2-R3.tar.gz b32da7d61421384a0874037576033861 gs704-j-vlib.zip -348bbc20f42b9d7dae4b08590649098b hpijs-1.5.tar.gz aea08da4e37ab68ed6f1dc451f24b30b lexmarkgs990908.tar.gz 0f88082030c6eb66a95804a6cc9b9e6b lxm3200-tweaked-20030501.tar.gz 34e664c2a98b847598f8441f8cac7ab6 pcl3-3.3.tar.gz