rpms/poppler/F-9 .cvsignore, 1.26, 1.27 poppler-ObjStream.patch, 1.8, 1.9 poppler-qt3-check.patch, 1.2, 1.3 poppler.spec, 1.72, 1.73 sources, 1.27, 1.28 fix-qt4-build.patch, 1.7, NONE poppler-0.8.0-ocg-crash.patch, 1.2, NONE poppler-0.8.1-AnnotQuadrilaterals.diff, 1.1, NONE poppler-0.8.1-CVE-2008-2950.diff, 1.1, NONE poppler-0.8.1-static-ft-lib.diff, 1.1, NONE

Rex Dieter rdieter at fedoraproject.org
Wed Oct 8 20:18:58 UTC 2008


Author: rdieter

Update of /cvs/pkgs/rpms/poppler/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30290

Modified Files:
	.cvsignore poppler-ObjStream.patch poppler-qt3-check.patch 
	poppler.spec sources 
Removed Files:
	fix-qt4-build.patch poppler-0.8.0-ocg-crash.patch 
	poppler-0.8.1-AnnotQuadrilaterals.diff 
	poppler-0.8.1-CVE-2008-2950.diff 
	poppler-0.8.1-static-ft-lib.diff 
Log Message:
* Wed Oct 08 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.8.7-1
- 0.8.7, fixes "Saving a PDF ... results in mangled file" (#462481)
- spec cosmetics from devel/ branch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/F-9/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	31 Mar 2008 03:24:47 -0000	1.26
+++ .cvsignore	8 Oct 2008 20:18:28 -0000	1.27
@@ -1 +1 @@
-poppler-0.8.0.tar.gz
+poppler-0.8.7.tar.gz

poppler-ObjStream.patch:

Index: poppler-ObjStream.patch
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/F-9/poppler-ObjStream.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- poppler-ObjStream.patch	28 Apr 2008 23:10:27 -0000	1.8
+++ poppler-ObjStream.patch	8 Oct 2008 20:18:28 -0000	1.9
@@ -1,6 +1,6 @@
-diff -up poppler-0.8.1/poppler-0.8.1/poppler/XRef.h.objstream poppler-0.8.1/poppler-0.8.1/poppler/XRef.h
---- poppler-0.8.1/poppler-0.8.1/poppler/XRef.h.objstream	20.8.11-21 21:00:59.000000000 +0100
-+++ poppler-0.8.1/poppler-0.8.1/poppler/XRef.h	20.8.12-18 17:18:47.000000000 +0100
+diff -up poppler/XRef.h.objstream poppler-0.8.6/poppler-0.8.6/poppler/XRef.h
+--- poppler/XRef.h.objstream	20.8.31-21 21:00:59.000000000 +0100
++++ poppler/XRef.h	20.8.32-18 17:18:47.000000000 +0100
 @@ -19,7 +19,36 @@
  class Dict;
  class Stream;
@@ -47,9 +47,9 @@
  
    // Write access
    void setModifiedObject(Object* o, Ref r);
-diff -up poppler-0.8.1/poppler-0.8.1/poppler/XRef.cc.objstream poppler-0.8.1/poppler-0.8.1/poppler/XRef.cc
---- poppler-0.8.1/poppler-0.8.1/poppler/XRef.cc.objstream	20.8.11-21 21:00:59.000000000 +0100
-+++ poppler-0.8.1/poppler-0.8.1/poppler/XRef.cc	20.8.12-18 17:18:47.000000000 +0100
+diff -up poppler/XRef.cc.objstream poppler/XRef.cc
+--- poppler/XRef.cc.objstream	20.8.31-21 21:00:59.000000000 +0100
++++ poppler/XRef.cc	20.8.32-18 17:18:47.000000000 +0100
 @@ -50,34 +50,9 @@
  // ObjectStream
  //------------------------------------------------------------------------

poppler-qt3-check.patch:

Index: poppler-qt3-check.patch
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/F-9/poppler-qt3-check.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- poppler-qt3-check.patch	3 Dec 2007 02:15:23 -0000	1.2
+++ poppler-qt3-check.patch	8 Oct 2008 20:18:28 -0000	1.3
@@ -1,6 +1,6 @@
-diff -up poppler-0.6.2/poppler-0.6.2/configure.qt3-check poppler-0.6.2/poppler-0.6.2/configure
---- poppler-0.6.2/poppler-0.6.2/configure.qt3-check	2007-11-10 07:04:36.000000000 -0500
-+++ poppler-0.6.2/poppler-0.6.2/configure	2007-12-02 21:14:01.000000000 -0500
+diff -up configure.qt3-check configure
+--- configure.qt3-check	2007-11-10 07:04:36.000000000 -0500
++++ configure	2007-12-02 21:14:01.000000000 -0500
 @@ -26165,8 +26165,8 @@ fi
  
  if test x$enable_poppler_qt = xyes; then


Index: poppler.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/F-9/poppler.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- poppler.spec	1 Aug 2008 09:48:42 -0000	1.72
+++ poppler.spec	8 Oct 2008 20:18:28 -0000	1.73
@@ -2,8 +2,8 @@
 
 Summary: PDF rendering library
 Name: poppler
-Version: 0.8.1
-Release: 2%{?dist}
+Version: 0.8.7
+Release: 1%{?dist}
 License: GPLv2 and Redistributable, no modification permitted
 # the code is GPLv2
 # the charmap data in /usr/share/poppler is redistributable
@@ -12,11 +12,6 @@
 Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.gz
 Source1: http://poppler.freedesktop.org/poppler-data-%{dataversion}.tar.gz
 Patch0: poppler-ObjStream.patch
-Patch1: fix-qt4-build.patch
-Patch2: poppler-0.8.0-ocg-crash.patch
-Patch3: poppler-0.8.1-CVE-2008-2950.diff
-Patch4: poppler-0.8.1-AnnotQuadrilaterals.diff
-Patch5: poppler-0.8.1-static-ft-lib.diff
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: gtk2-devel
@@ -35,9 +30,6 @@
 Requires: pkgconfig
 
 %description devel
-Poppler, a PDF rendering library, is a fork of the xpdf PDF
-viewer developed by Derek Noonburg of Glyph and Cog, LLC.
-
 You should install the poppler-devel package if you would like to
 compile applications based on poppler.
 
@@ -54,7 +46,6 @@
 Group: Development/Libraries
 Requires: %{name}-glib = %{version}-%{release}
 Requires: %{name}-devel = %{version}-%{release}
-Requires: pkgconfig
 Requires: gtk-doc
 
 %description glib-devel
@@ -62,14 +53,14 @@
 
 
 %package qt
-Summary: Qt wrapper for poppler
+Summary: Qt3 wrapper for poppler
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 %description qt
 %{summary}.
 
 %package qt-devel
-Summary: Development files for Qt wrapper
+Summary: Development files for Qt3 wrapper
 Group:   Development/Libraries
 Requires: %{name}-qt = %{version}-%{release}
 Requires: %{name}-devel = %{version}-%{release}
@@ -115,17 +106,14 @@
 
 %prep
 %setup -c -q -a1
-%patch0 -p1 -b .objstream
-%patch1 -p1 -b .fix-qt4-build
-%patch2 -p1 -b .ocg
-%patch3 -p1 -b .CVE-2008-2950
-%patch4 -p1 -b .QuadPoints
-%patch5 -p1 -b .static-ft
+pushd %{name}-%{version}
+%patch0 -p0 -b .objstream
+popd
 
 %build
 pushd %{name}-%{version}
-# despair
-sed -i s/qt3/qt-3.3/g configure
+# can use in a pinch, but isn't necessary (in general) -- Rex 
+unset QTDIR && . /etc/profile.d/qt.sh
 %configure \
   --disable-static \
   --enable-cairo-output \
@@ -207,6 +195,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Oct 08 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.8.7-1
+- 0.8.7, fixes "Saving a PDF ... results in mangled file" (#462481)
+- spec cosmetics from devel/ branch
+
 * Thu Jul 31 2008 Tomas Hoger <thoger at redhat.com> - 0.8.1-2
 - Security update:
   Add upstream patch for CVE-2008-2950 / oCERT-2008-007 - use of
@@ -214,7 +206,7 @@
 - Bug fixes:
   Fix crash when reading QuadPoints (#448516)
   Use static FT_Library in CairoOutputDev, as dynamic may trigger
-  use-after-free and crash e.g. evince (#456867) 
+  use-after-free and crash e.g. evince (#456867)
 
 * Mon Apr 28 2008 Matthias Clasen <mclasen at redhat.com> - 0.8.1-1
 - Update to 0.8.1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poppler/F-9/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	28 Apr 2008 23:10:27 -0000	1.27
+++ sources	8 Oct 2008 20:18:28 -0000	1.28
@@ -1,2 +1,2 @@
-5a01efb00338e3e0375fd4159cdb96bf  poppler-0.8.1.tar.gz
+9af81429d6f8639c357a5eed25583365  poppler-0.8.7.tar.gz
 b7f98e84a4d2a2c794271d746ec7ee0b  poppler-data-0.2.0.tar.gz


--- fix-qt4-build.patch DELETED ---


--- poppler-0.8.0-ocg-crash.patch DELETED ---


--- poppler-0.8.1-AnnotQuadrilaterals.diff DELETED ---


--- poppler-0.8.1-CVE-2008-2950.diff DELETED ---


--- poppler-0.8.1-static-ft-lib.diff DELETED ---




More information about the scm-commits mailing list