rpms/poppler/devel poppler-ObjStream.patch, 1.1, 1.2 poppler.spec, 1.58, 1.59

[Jindrich Novy (jnovy)]

Author: jnovy

Update of /cvs/extras/rpms/poppler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19917

Modified Files:
	poppler-ObjStream.patch poppler.spec 
Log Message:
* Mon Feb 18 2008 Jindrich Novy <jnovy at redhat.com> - 0.6.4-3
- apply ObjStream patch (#433090)


poppler-ObjStream.patch:

Index: poppler-ObjStream.patch
===================================================================
RCS file: /cvs/extras/rpms/poppler/devel/poppler-ObjStream.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- poppler-ObjStream.patch	29 Nov 2007 22:07:51 -0000	1.1
+++ poppler-ObjStream.patch	18 Feb 2008 18:01:31 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up poppler-0.6.2/poppler-0.6.2/poppler/XRef.h.objstream poppler-0.6.2/poppler-0.6.2/poppler/XRef.h
---- poppler-0.6.2/poppler-0.6.2/poppler/XRef.h.objstream	2007-11-05 00:11:05.000000000 +0100
-+++ poppler-0.6.2/poppler-0.6.2/poppler/XRef.h	2007-11-28 12:23:02.000000000 +0100
+diff -up poppler-0.6.4/poppler-0.6.4/poppler/XRef.h.objstream poppler-0.6.4/poppler-0.6.4/poppler/XRef.h
+--- poppler-0.6.4/poppler-0.6.4/poppler/XRef.h.objstream	2008-01-21 21:00:59.000000000 +0100
++++ poppler-0.6.4/poppler-0.6.4/poppler/XRef.h	2008-02-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.6.2/poppler-0.6.2/poppler/XRef.cc.objstream poppler-0.6.2/poppler-0.6.2/poppler/XRef.cc
---- poppler-0.6.2/poppler-0.6.2/poppler/XRef.cc.objstream	2007-11-05 00:11:05.000000000 +0100
-+++ poppler-0.6.2/poppler-0.6.2/poppler/XRef.cc	2007-11-28 12:23:02.000000000 +0100
+diff -up poppler-0.6.4/poppler-0.6.4/poppler/XRef.cc.objstream poppler-0.6.4/poppler-0.6.4/poppler/XRef.cc
+--- poppler-0.6.4/poppler-0.6.4/poppler/XRef.cc.objstream	2008-01-21 21:00:59.000000000 +0100
++++ poppler-0.6.4/poppler-0.6.4/poppler/XRef.cc	2008-02-18 17:18:47.000000000 +0100
 @@ -50,34 +50,9 @@
  // ObjectStream
  //------------------------------------------------------------------------


Index: poppler.spec
===================================================================
RCS file: /cvs/extras/rpms/poppler/devel/poppler.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- poppler.spec	29 Jan 2008 15:57:56 -0000	1.58
+++ poppler.spec	18 Feb 2008 18:01:31 -0000	1.59
@@ -3,7 +3,7 @@
 Summary: PDF rendering library
 Name: poppler
 Version: 0.6.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2 and Redistributable, no modification permitted
 # the code is GPLv2
 # the charmap data in /usr/share/poppler is redistributable
@@ -11,6 +11,7 @@
 URL:     http://poppler.freedesktop.org/
 Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.gz
 Source1: http://poppler.freedesktop.org/poppler-data-%{dataversion}.tar.gz
+Patch0: poppler-ObjStream.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: gtk2-devel
@@ -109,6 +110,7 @@
 
 %prep
 %setup -c -q -a1
+%patch0 -p1 -b .objstream
 
 %build
 ( cd  %{name}-%{version}
@@ -193,6 +195,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Feb 18 2008 Jindrich Novy <jnovy at redhat.com> - 0.6.4-3
+- apply ObjStream patch (#433090)
+
 * Tue Jan 29 2008 Matthias Clasen <mclasen at redhat.com> - 0.6.4-2
 - Add some required inter-subpackge deps