From 72a87bf0c27f9386f21efd450dfd7064f5c35b0d Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 05:17:15 +0000 Subject: auto-import ghostscript-7.05-32 from ghostscript-7.05-32.src.rpm --- diff --git a/.cvsignore b/.cvsignore index 3e33837..93c3770 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1,4 @@ -CIDFnmap-cjk-20020627.tar.gz +CIDFnmap-cjk-20030115.tar.gz acro5-cmaps-2001.tar.gz adobe-cmaps-200202.tar.gz eplaseren-1.0.2-550.tgz diff --git a/ghostscript.spec b/ghostscript.spec index d262df3..1dca201 100644 --- a/ghostscript.spec +++ b/ghostscript.spec @@ -5,7 +5,7 @@ Version: %{gs_ver} BuildRequires: gimp-print-devel BuildRequires: patchutils >= 0.2.13 -Release: 25 +Release: 32 %define hpijs 1.3 %define hpijs_release %{release} @@ -45,7 +45,7 @@ Source15: ftp://ftp.u-aizu.ac.jp/pub/tex/ptex-win32/gs/%{vflib_ver}-j-vlib.zip Source16: ftp://ftp.gyve.org/pub/gs-cjk/acro5-cmaps-2001.tar.gz Source17: gdevgdi.c Source18: http://www.epkowa.on.arena.ne.jp/pips/data/2050/eplaseren-1.0.2-550.tgz -Source20: CIDFnmap-cjk-20020627.tar.gz +Source20: CIDFnmap-cjk-20030115.tar.gz # Some drivers mistakenly got left out of 7.05. Source21: gnu-drivers.tar.gz @@ -67,15 +67,15 @@ Patch16: ghostscript-6.51-gdevgdi.patch Patch17: ghostscript-6.51-Epson_eplaseren.patch Patch18: ghostscript-6.51-gs_path.patch Patch19: ghostscript-6.51-ia64_jmp_buf.patch -Patch21: Omni-7.05-071902.patch +Patch21: Omni-7.05-121002.patch Patch24: ghostscript-7.05-scripts.patch Patch25: ghostscript-7.05-gsj-fixups.patch Patch26: ghostscript-7.05-dx6.patch Patch27: ghostscript-7.05-fPIC.patch Patch28: ghostscript-7.05-gb18030.patch -Patch29: hpijs-1.3-rss.1.patch -Patch30: ghostscript-7.05-x11.patch -Patch31: ghostscript-7.05-ps1.patch +Patch29: ghostscript-7.05-x11.patch +Patch30: ghostscript-7.05-ps1.patch +Patch31: ghostscript-7.05-oob-66421.patch # I dont think this patch is needed anymore, so it is not applied. # but I might be wrong, and dont really understand it, so it is still @@ -93,6 +93,9 @@ BuildRequires: cups-devel >= 1.1.13 BuildPreReq: freetype-devel BuildRoot: %{_tmppath}/%{name}-%{gs_ver}-root +# We shipped this in Red Hat Linux 8.0. +Obsoletes: ghostscript-gtk + %description Ghostscript is a set of software that provides a PostScript(TM) interpreter, a set of C procedures (the Ghostscript library, which @@ -116,13 +119,13 @@ Group: Development/Libraries %description devel The header files for developing applications that use ghostscript. -%package gtk -Summary: A GTK-enabled PostScript(TM) interpreter and renderer. -Requires: %{name} = %{version} -Group: Applications/Publishing - -%description gtk -A GTK-enabled version of Ghostscript, called 'gsx'. +#%package gtk +#Summary: A GTK-enabled PostScript(TM) interpreter and renderer. +#Requires: %{name} = %{version} +#Group: Applications/Publishing +# +#%description gtk +#A GTK-enabled version of Ghostscript, called 'gsx'. %package -n hpijs Version: %{hpijs} @@ -275,7 +278,7 @@ PhotoSmart, DeskJet 990C and PhotoSmart 100 series. GS_DEVS=$GS_DEVS'$(DD)omni.dev ' # Apply the 052902 patch. -%patch21 -p0 -b .Omni.071902 +%patch21 -p1 -b .Omni.121002 # Fix some shell scripts %patch24 -p1 -b .scripts @@ -461,16 +464,11 @@ $(GLOBJ)gdevcups.$(OBJ): $(GLSRC)gdevcups.c $(PDEVH) # Add CIDnmap for GB18030 font (bug #71135) %patch28 -p1 -b .gb18030 -# Patch hpijs with Richard Spencer-Smith's enhancements. -cd hpijs-%{hpijs} -%patch29 -p1 -b .rss -cd .. - # Fix XLIBDIR -%patch30 -p1 -b .x11 +%patch29 -p1 -b .x11 # Fix level 1 PostScript output (bug #78450). -%patch31 -p1 -b .ps1 +%patch30 -p1 -b .ps1 # 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 @@ -489,6 +487,8 @@ IJSDEVS='\$(DD)ijs.dev' IJSEXECTYPE=unix EOF +%patch31 -p1 -b .oob + %build # Build IJS cd ijs @@ -497,7 +497,8 @@ make cd .. make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix} -make so RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix} +# Don't build the shared object at the moment: it's big and nothing uses it. +#make so RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix} # Build the HP IJS server cd hpijs-%{hpijs} @@ -511,12 +512,13 @@ mkdir -p $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/{%{_mandir},%{_bindir},%{_datadir},%{_docdir}} mkdir -p $RPM_BUILD_ROOT/{%{_libdir},%{_includedir}/ijs} -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} +make install \ + 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} cd hpijs-%{hpijs} make install DESTDIR=$RPM_BUILD_ROOT cd .. @@ -567,13 +569,13 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/ghostscript/%{gs_ver}/examples %{_mandir}/*/* %doc %{_docdir}/%{name}-%{gs_ver} -%{_libdir}/libgs.so.* -%{_libdir}/libgs.so +#%{_libdir}/libgs.so.* +#%{_libdir}/libgs.so %{_libdir}/libijs.so* -%files gtk -%defattr(-,root,root) -%{_bindir}/gsx +#%files gtk +#%defattr(-,root,root) +#%{_bindir}/gsx %files -n hpijs %defattr(-,root,root) @@ -590,6 +592,29 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libijs.a %changelog +* Mon Feb 24 2003 Elliot Lee +- debuginfo rebuild + +* Fri Feb 21 2003 Elliot Lee 7.05-31 +- Add ghostscript-7.05-oob-66421.patch to fix the segfault behind #66421 + +* Thu Jan 30 2003 Tim Waugh 7.05-30 +- Remove rss patch from hpijs (not needed). + +* Wed Jan 22 2003 Tim Powers 7.05-29 +- rebuilt + +* Thu Jan 16 2003 Tim Waugh 7.05-28 +- Add Korean font aliases to CIDFnmap CJK resource files (bug #81924). + +* Sat Dec 14 2002 Tim Waugh 7.05-27 +- Obsolete ghostscript-gtk (bug #79585). +- Omni 121002 patch. + +* Tue Dec 10 2002 Tim Waugh 7.05-26 +- Don't ship the shared object yet (part of bug #79340). +- Don't make the gtk package, since that needs the shared object. + * Tue Nov 26 2002 Tim Waugh 7.05-25 - Fix level 1 PostScript output (bug #78450). - No need to carry gomni.c, since it comes from the patch. diff --git a/sources b/sources index d89be69..c7d1710 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -7edfe1f39861ded3cae68990a96b0ad1 CIDFnmap-cjk-20020627.tar.gz +75fbe1a1c474d67fbc71cc4b1dbfb833 CIDFnmap-cjk-20030115.tar.gz 2fbae60417d42779f6488ab897dcaaf6 acro5-cmaps-2001.tar.gz e8fbffadb8d70ce5f92708a699ae7765 adobe-cmaps-200202.tar.gz 911c7865a83a69135417989dee53f8fc eplaseren-1.0.2-550.tgz