--- a/SUNWgnome-pdf-viewer.spec	Mon Sep 17 05:57:54 2007 +0000
+++ b/SUNWgnome-pdf-viewer.spec	Mon Sep 17 12:13:21 2007 +0000
@@ -11,7 +11,7 @@
 #
 %include Solaris.inc
 
-#%use popplerdata = poppler-data.spec
+%use popplerdata = poppler-data.spec
 %use poppler = poppler.spec
 %use evince = evince.spec
 
@@ -20,18 +20,6 @@
 Version:                 %{default_pkg_version}
 SUNW_BaseDir:            %{_basedir}
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
-Source1:                ftp://ftp.foolabs.com/pub/xpdf/xpdf-arabic.tar.gz
-Source2:                ftp://ftp.foolabs.com/pub/xpdf/xpdf-chinese-simplified.tar.gz
-Source3:                ftp://ftp.foolabs.com/pub/xpdf/xpdf-chinese-traditional.tar.gz
-Source4:                ftp://ftp.foolabs.com/pub/xpdf/xpdf-cyrillic.tar.gz
-Source5:                ftp://ftp.foolabs.com/pub/xpdf/xpdf-greek.tar.gz
-Source6:                ftp://ftp.foolabs.com/pub/xpdf/xpdf-hebrew.tar.gz
-Source7:                ftp://ftp.foolabs.com/pub/xpdf/xpdf-japanese.tar.gz
-Source8:                ftp://ftp.foolabs.com/pub/xpdf/xpdf-korean.tar.gz
-Source9:                ftp://ftp.foolabs.com/pub/xpdf/xpdf-latin2.tar.gz
-Source10:               ftp://ftp.foolabs.com/pub/xpdf/xpdf-thai.tar.gz
-Source11:               ftp://ftp.foolabs.com/pub/xpdf/xpdf-turkish.tar.gz
-
 
 %include default-depend.inc
 BuildRequires: SUNWlibpopt-devel
@@ -95,20 +83,9 @@
 %prep
 rm -rf %name-%version
 mkdir %name-%version
-#%popplerdata.prep -d %name-%version
+%popplerdata.prep -d %name-%version
 %poppler.prep -d %name-%version
 %evince.prep -d %name-%version
-gzcat %SOURCE1  |tar -xf -
-gzcat %SOURCE2  |tar -xf -
-gzcat %SOURCE3  |tar -xf -
-gzcat %SOURCE4  |tar -xf -
-gzcat %SOURCE5  |tar -xf -
-gzcat %SOURCE6  |tar -xf -
-gzcat %SOURCE7  |tar -xf -
-gzcat %SOURCE8  |tar -xf -
-gzcat %SOURCE9  |tar -xf -
-gzcat %SOURCE10 |tar -xf -
-gzcat %SOURCE11 |tar -xf -
 
 
 %build
@@ -125,7 +102,7 @@
 export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
 export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
 
-#%popplerdata.build -d %name-%version
+%popplerdata.build -d %name-%version
 %poppler.build -d %name-%version
 
 export PKG_CONFIG_PATH=../poppler-%{poppler.version}:%{_pkg_config_path}
@@ -133,21 +110,10 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-#%popplerdata.install -d %name-%version
+%popplerdata.install -d %name-%version
 %poppler.install -d %name-%version
 %evince.install -d %name-%version
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/xpdf
-for file in xpdf-*/add-to-xpdfrc ; do
-  sed -e "s|/usr/local/share/xpdf|%{_datadir}/xpdf|" $file >$file.new
-  mv -f $file.new $file
-  dir=`dirname $file`
-  lang=`echo $dir|sed -e "s|xpdf-||"`
-  cp -r $dir $RPM_BUILD_ROOT%{_datadir}/xpdf/$lang
-  echo >>$RPM_BUILD_ROOT%{_sysconfdir}/xpdfrc
-  cat $file >>$RPM_BUILD_ROOT%{_sysconfdir}/xpdfrc
-done
-
 # Remove unneeded scrollkeeper dirs
 rm -rf $RPM_BUILD_ROOT%{_localstatedir}
 
@@ -234,11 +200,8 @@
 %{_datadir}/gnome/help/evince/C
 %{_datadir}/omf/evince/*-C.omf
 %attr (-, root, other) %{_datadir}/icons
-# Uncomment when we add poppler-data back to the build.
-#%dir %attr (0755, root, bin) %{_datadir}/poppler
-#%{_datadir}/poppler/*
-%dir %attr (0755, root, other) %{_datadir}/xpdf
-%{_datadir}/xpdf/*
+%dir %attr (0755, root, bin) %{_datadir}/poppler
+%{_datadir}/poppler/*
 %dir %attr(0755, root, bin) %{_mandir}
 %dir %attr(0755, root, bin) %{_mandir}/*
 %{_mandir}/*/*
@@ -269,9 +232,12 @@
 %{_sysconfdir}/gconf/schemas/evince.schemas
 %{_sysconfdir}/gconf/schemas/evince-thumbnailer.schemas
 %{_sysconfdir}/gconf/schemas/evince-thumbnailer-ps.schemas
-%attr (0644, root, sys) %{_sysconfdir}/xpdfrc
 
 %changelog
+* Mon Sep 17 2007 - [email protected]
+- Remove the now obsolete xpdf fonts since this is not supported in poppler
+  any more since 0.6. Add the poppler-data datafiles which are replacing the
+  xpdf fonts.
 * Wed Jul 04 2007 - [email protected]
 - Add evince-thumbnailer.schemas from %files and %preun root back, they were
   net being generated because evince was building without PDF support.