From 310a76fc3770aec588bc3eadbd35eea2bb88afaa Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Jun 03 2005 22:13:52 +0000 Subject: More build fixes. --- diff --git a/ghostscript.spec b/ghostscript.spec index 0cc4d65..7b52540 100644 --- a/ghostscript.spec +++ b/ghostscript.spec @@ -120,6 +120,7 @@ make install soinstall \ docdir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{gs_ver} \ gsdir=$RPM_BUILD_ROOT%{_datadir}/%{name} \ gsdatadir=$RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_ver} \ + gssharedir=$RPM_BUILD_ROOT%{_libdir}/%{name}/%{gs_ver} \ CUPSSERVER=$RPM_BUILD_ROOT`cups-config --serverbin` \ CUPSCONFIG=$RPM_BUILD_ROOT`cups-config --serverroot` \ CUPSDATA=$RPM_BUILD_ROOT`cups-config --datadir` @@ -145,6 +146,10 @@ install -m0644 src/iapi.h $RPM_BUILD_ROOT%{_includedir}/ghostscript install -m0644 src/errors.h $RPM_BUILD_ROOT%{_includedir}/ghostscript install -m0644 src/gdevdsp.h $RPM_BUILD_ROOT%{_includedir}/ghostscript +# Don't ship pkgconfig files. Note: this always gets installed in /usr/lib +# regardless of multilib. +rm -f $RPM_BUILD_ROOT/usr/lib/pkgconfig/ijs.pc + # Don't ship ijs example client or server rm -f $RPM_BUILD_ROOT%{_bindir}/ijs_{client,server}_example @@ -185,6 +190,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libgs.so.* %{_libdir}/libgs.so %{_libdir}/libijs*.so* +%{_libdir}/%{name}/%{gs_ver} %{_libdir}/cups/filter/pstopxl %{_datadir}/cups/model/pxl* @@ -200,7 +206,6 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/ijs/* %{_bindir}/ijs-config %{_libdir}/libijs.*a -%{_libdir}/pkgconfig/ijs.pc %post -p /sbin/ldconfig