rpms/poppler/devel poppler-ObjStream.patch, 1.3, 1.4 poppler.spec, 1.62, 1.63

[Matthias Clasen (mclasen)]

Author: mclasen

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

Modified Files:
	poppler-ObjStream.patch poppler.spec 
Log Message:
fix patch


poppler-ObjStream.patch:

Index: poppler-ObjStream.patch
===================================================================
RCS file: /cvs/extras/rpms/poppler/devel/poppler-ObjStream.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- poppler-ObjStream.patch	21 Feb 2008 15:51:15 -0000	1.3
+++ poppler-ObjStream.patch	29 Feb 2008 03:11:31 -0000	1.4
@@ -1,6 +1,6 @@
-diff -up poppler-0.7.0/poppler-0.7.0/poppler/XRef.h.objstream poppler-0.7.0/poppler-0.7.0/poppler/XRef.h
---- poppler-0.7.0/poppler-0.7.0/poppler/XRef.h.objstream	2008-01-21 21:00:59.000000000 +0100
-+++ poppler-0.7.0/poppler-0.7.0/poppler/XRef.h	2008-02-18 17:18:47.000000000 +0100
+diff -up poppler-0.7.1/poppler-0.7.1/poppler/XRef.h.objstream poppler-0.7.1/poppler-0.7.1/poppler/XRef.h
+--- poppler-0.7.1/poppler-0.7.1/poppler/XRef.h.objstream	2008-01-21 21:00:59.000000000 +0100
++++ poppler-0.7.1/poppler-0.7.1/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.7.0/poppler-0.7.0/poppler/XRef.cc.objstream poppler-0.7.0/poppler-0.7.0/poppler/XRef.cc
---- poppler-0.7.0/poppler-0.7.0/poppler/XRef.cc.objstream	2008-01-21 21:00:59.000000000 +0100
-+++ poppler-0.7.0/poppler-0.7.0/poppler/XRef.cc	2008-02-18 17:18:47.000000000 +0100
+diff -up poppler-0.7.1/poppler-0.7.1/poppler/XRef.cc.objstream poppler-0.7.1/poppler-0.7.1/poppler/XRef.cc
+--- poppler-0.7.1/poppler-0.7.1/poppler/XRef.cc.objstream	2008-01-21 21:00:59.000000000 +0100
++++ poppler-0.7.1/poppler-0.7.1/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.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- poppler.spec	29 Feb 2008 03:01:12 -0000	1.62
+++ poppler.spec	29 Feb 2008 03:11:31 -0000	1.63
@@ -112,7 +112,7 @@
 %prep
 %setup -c -q -a1
 %patch0 -p1 -b .objstream
-%patch1 -p1 -b .fix-qt4-build
+#%patch1 -p1 -b .fix-qt4-build
 
 %build
 ( cd  %{name}-%{version}