diff --git a/ghostscript.spec b/ghostscript.spec index 3d62acc..ae46b6e 100644 --- a/ghostscript.spec +++ b/ghostscript.spec @@ -1,11 +1,12 @@ %define gs_ver 8.15.1 +%define gs_dot_ver 8.15 %{expand: %%define build_with_freetype %{?_with_freetype:1}%{!?_with_freetype:0}} Summary: A PostScript(TM) interpreter and renderer. Name: ghostscript Version: %{gs_ver} BuildRequires: libjpeg-devel -Release: 0.%{?gs_rc:%gs_rc.}1 +Release: 1 License: GPL URL: http://www.cups.org/espgs/ @@ -152,10 +153,10 @@ make install soinstall \ datadir=$RPM_BUILD_ROOT%{_datadir} \ bindir=$RPM_BUILD_ROOT%{_bindir} \ libdir=$RPM_BUILD_ROOT%{_libdir} \ - docdir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{gs_ver} \ + docdir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{gs_dot_ver} \ gsdir=$RPM_BUILD_ROOT%{_datadir}/%{name} \ - gsdatadir=$RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_ver} \ - gssharedir=$RPM_BUILD_ROOT%{_libdir}/%{name}/%{gs_ver} \ + gsdatadir=$RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver} \ + gssharedir=$RPM_BUILD_ROOT%{_libdir}/%{name}/%{gs_dot_ver} \ CUPSSERVER=$RPM_BUILD_ROOT`cups-config --serverbin` \ CUPSCONFIG=$RPM_BUILD_ROOT`cups-config --serverroot` \ CUPSDATA=$RPM_BUILD_ROOT`cups-config --datadir` @@ -170,17 +171,17 @@ ln -sf gs.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/ghostscript.1.gz ln -sf gs $RPM_BUILD_ROOT/usr/bin/ghostscript # Rename an original FAPIcidfmap to FAPIcidfmap.GS -mv $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_ver}/lib/FAPIcidfmap{,.GS} +mv $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver}/lib/FAPIcidfmap{,.GS} # Rename an original cidfmap to cidfmap.GS -mv $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_ver}/lib/cidfmap{,.GS} +mv $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver}/lib/cidfmap{,.GS} # Install our own FAPIcidfmap/cidfmap to allow the separated # FAPIcidfmap/cidfmap which the font packages own. -install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_ver}/lib/FAPIcidfmap -install -m0644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_ver}/lib/cidfmap +install -m0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver}/lib/FAPIcidfmap +install -m0644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver}/lib/cidfmap # Install adobe/acro5 CMaps (bug #165428). -tar zxf %{SOURCE2} -C $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_ver}/Resource -tar zxf %{SOURCE3} -C $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_ver}/Resource +tar zxf %{SOURCE2} -C $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver}/Resource +tar zxf %{SOURCE3} -C $RPM_BUILD_ROOT%{_datadir}/%{name}/%{gs_dot_ver}/Resource # Don't ship sysvlp.sh. rm -f $RPM_BUILD_ROOT/usr/bin/sysvlp.sh @@ -212,7 +213,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/ghostscript find $RPM_BUILD_ROOT%{_mandir}/de/man1 -type l | xargs rm -f MAIN_PWD=`pwd` -(cd $RPM_BUILD_ROOT; find ./usr/share/ghostscript/%{gs_ver}/lib/* | \ +(cd $RPM_BUILD_ROOT; find ./usr/share/ghostscript/%{gs_dot_ver}/lib/* | \ sed -e 's/\.//;' | grep -v lib/Fontmap* | grep -v gs_init.ps > $MAIN_PWD/rpm.sharelist find .%{_bindir}/ | sed -e 's/\.//;' | \ grep -v '/$\|/hpijs$\|/gsx$\|/ijs-config$' \ @@ -225,18 +226,18 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %dir /etc/ghostscript %dir %{_datadir}/ghostscript -%dir %{_datadir}/ghostscript/%{gs_ver} -%dir %{_datadir}/ghostscript/%{gs_ver}/lib -%config %{_datadir}/ghostscript/%{gs_ver}/lib/gs_init.ps -%config %{_datadir}/ghostscript/%{gs_ver}/lib/Fontmap* -%{_datadir}/ghostscript/%{gs_ver}/Resource/ -%{_datadir}/ghostscript/%{gs_ver}/examples +%dir %{_datadir}/ghostscript/%{gs_dot_ver} +%dir %{_datadir}/ghostscript/%{gs_dot_ver}/lib +%config %{_datadir}/ghostscript/%{gs_dot_ver}/lib/gs_init.ps +%config %{_datadir}/ghostscript/%{gs_dot_ver}/lib/Fontmap* +%{_datadir}/ghostscript/%{gs_dot_ver}/Resource/ +%{_datadir}/ghostscript/%{gs_dot_ver}/examples %{_mandir}/*/* -%doc %{_docdir}/%{name}-%{gs_ver} +%doc %{_docdir}/%{name}-%{gs_dot_ver} %{_libdir}/libgs.so.* %{_libdir}/libgs.so %{_libdir}/libijs*.so* -%{_libdir}/%{name}/%{gs_ver} +%{_libdir}/%{name}/%{gs_dot_ver} %{_libdir}/cups/filter/pstopxl %{_datadir}/cups/model/pxl* @@ -258,6 +259,9 @@ rm -rf $RPM_BUILD_ROOT %postun -p /sbin/ldconfig %changelog +* Mon Sep 26 2005 Tim Waugh 8.15.1-1 +- Some directories should be "8.15" not "8.15.1" (bug #169198). + * Thu Sep 22 2005 Tim Waugh 8.15.1-0.1 - 8.15.1. - No longer need overflow patch.