rpms/poppler/devel poppler.spec,1.89,1.90

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/poppler/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7472/devel

Modified Files:
	poppler.spec 
Log Message:
document ObjStream patch



Index: poppler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/devel/poppler.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- poppler.spec	20 Jun 2009 05:30:01 -0000	1.89
+++ poppler.spec	22 Jun 2009 19:48:24 -0000	1.90
@@ -3,7 +3,7 @@
 Summary: PDF rendering library
 Name: poppler
 Version: 0.11.0
-Release: 4%{?dist}
+Release: 2%{?dist}
 License: GPLv2 and Redistributable, no modification permitted
 # the code is GPLv2
 # the charmap data in /usr/share/poppler is redistributable
@@ -11,13 +11,13 @@ Group: Development/Libraries
 URL:     http://poppler.freedesktop.org/
 Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.gz
 Source1: http://poppler.freedesktop.org/poppler-data-%{dataversion}.tar.gz
+# for texlive/pdftex, TODO: upstream
 Patch0: poppler-ObjStream.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: automake libtool
 BuildRequires: cairo-devel
 BuildRequires: gtk2-devel
-BuildRequires: libjpeg-devel
 BuildRequires: lcms-devel
 BuildRequires: openjpeg-devel >= 1.3-5
 BuildRequires: qt3-devel
@@ -109,7 +109,7 @@ converting PDF files to a number of othe
 %prep
 %setup -c -q -a1
 pushd %{name}-%{version}
-%patch0 -p0 -b .objstream
+#patch0 -p0 -b .objstream
 # hammer to nuke rpaths, recheck on new releases
 autoreconf -i -f
 popd
@@ -121,7 +121,6 @@ unset QTDIR && . /etc/profile.d/qt.sh
 %configure \
   --disable-static \
   --enable-cairo-output \
-  --enable-libjpeg \
   --enable-libopenjpeg \
   --enable-poppler-qt \
   --enable-poppler-qt4 \
@@ -222,12 +221,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sat Jun 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.11.0-4
-- --enable-libjpeg
-
 * Fri Jun 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.11.0-3
-- --enable-libopenjpeg
-- (explicitly) --disable-zlib
+- --enable-libopenjpeg, --disable-zlib
 
 * Sun May 24 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.11.0-2
 - update changelog