rpms/xpdf/FC-4 sources,1.13,1.14 xpdf.spec,1.55,1.56

[fedora-cvs-commits at redhat.com]

Author: krh

Update of /cvs/dist/rpms/xpdf/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv10635

Modified Files:
	sources xpdf.spec 
Log Message:
- Update sources file and drop t1lib support entirely.



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xpdf/FC-4/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	14 Dec 2005 21:13:40 -0000	1.13
+++ sources	14 Dec 2005 21:22:02 -0000	1.14
@@ -1 +1,7 @@
+030392ef4ad4e75caf899064265f73aa  xpdf-chinese-simplified.tar.gz
+233d80c56b636facb434c510addc0f28  xpdf-chinese-traditional.tar.gz
+4d80764d10ff406ddb7d26784ed575d9  xpdf-cyrillic.tar.gz
+7f3d680a49fd71cb86c0d60527402217  xpdf-japanese.tar.gz
+308af86071963cc959d596c710ac4119  xpdf-korean.tar.gz
+c4954dad99e2c2df997ac50dc2c09d1b  xpdf-thai.tar.gz
 e004c69c7dddef165d768b1362b44268  xpdf-3.01.tar.gz


Index: xpdf.spec
===================================================================
RCS file: /cvs/dist/rpms/xpdf/FC-4/xpdf.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- xpdf.spec	14 Dec 2005 21:14:44 -0000	1.55
+++ xpdf.spec	14 Dec 2005 21:22:02 -0000	1.56
@@ -1,7 +1,5 @@
 %define desktop_file 1
 %define desktop_file_utils_version 0.2.90
-%define t1lib_version 5.1.0
-%define t1lib 0
 %define monolithic 1
 
 Summary: A PDF file viewer for the X Window System.
@@ -14,7 +12,6 @@
 Group: Applications/Publishing
 
 Source0: ftp://ftp.foolabs.com/pub/xpdf/%{name}-%{version}.tar.gz
-Source1: ftp://ftp.foolabs.com/pub/xpdf/t1lib-%{t1lib_version}.tar.gz
 Source3: ftp://ftp.foolabs.com/pub/xpdf/xpdf-chinese-simplified.tar.gz
 Source4: ftp://ftp.foolabs.com/pub/xpdf/xpdf-chinese-traditional.tar.gz
 Source5: ftp://ftp.foolabs.com/pub/xpdf/xpdf-japanese.tar.gz
@@ -108,7 +105,7 @@
 KSX1001 encoding
 
 %prep
-%setup -q -a 1 -a 3 -a 4 -a 5 -a 6
+%setup -q -a 3 -a 4 -a 5 -a 6
 %patch -p1
 %patch3 -p1 -b .ext
 %patch6 -p1 -b .core
@@ -123,13 +120,6 @@
 %build
 find -name "*orig" | xargs rm -f
 
-%if %{t1lib}
-   pushd t1lib-%{t1lib_version}
-   %configure --disable-shared --enable-static
-   make %{?_smp_mflags} without_doc
-   popd
-%endif
-
 autoconf
 %configure \
    --enable-multithreaded \
@@ -138,12 +128,7 @@
    --with-gzip \
    --enable-opi \
    --with-appdef-dir=/usr/X11R6/lib/X11/app-defaults/ \
-%if %{t1lib}
-   --with-t1-library=`pwd`/t1lib-%{t1lib_version}/lib/.libs \
-   --with-t1-includes=`pwd`/t1lib-%{t1lib_version}/lib \
-%else
-  --without-t1-library \
-%endif
+   --without-t1-library \
    --with-freetype2-library=%{_libdir} \
    --with-freetype2-includes=%{_includedir}/freetype2
 
@@ -220,6 +205,7 @@
 %changelog
 * Wed Dec 14 2005 Kristian Høgsberg <krh at redhat.com> 1:3.01-0.FC4.5
 - Bump release.
+- Update sources file and drop t1lib support entirely.
 
 * Wed Dec 14 2005 Kristian Høgsberg <krh at redhat.com> 1:3.01-0.FC4.4
 - Add xpdf-3.01-CVE-2005-3191.patch to fix security bug #173888 and