rpms/poppler/devel fix-qt4-build.patch, NONE, 1.1 .cvsignore, 1.21, 1.22 poppler-ObjStream.patch, 1.2, 1.3 poppler.spec, 1.60, 1.61 sources, 1.21, 1.22

[Matthias Clasen (mclasen)]

Author: mclasen

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

Modified Files:
	.cvsignore poppler-ObjStream.patch poppler.spec sources 
Added Files:
	fix-qt4-build.patch 
Log Message:
0.7.0


fix-qt4-build.patch:

--- NEW FILE fix-qt4-build.patch ---
diff -up poppler-0.7.0/poppler-0.7.0/qt4/Makefile.in.fix-qt4-build poppler-0.7.0/poppler-0.7.0/qt4/Makefile.in
--- poppler-0.7.0/poppler-0.7.0/qt4/Makefile.in.fix-qt4-build	2008-02-21 10:29:14.000000000 -0500
+++ poppler-0.7.0/poppler-0.7.0/qt4/Makefile.in	2008-02-21 10:29:22.000000000 -0500
@@ -223,7 +223,7 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 win32_libs = @win32_libs@
-SUBDIRS = src tests demos
+SUBDIRS = src tests 
 all: all-recursive
 
 .SUFFIXES:


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/poppler/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	29 Jan 2008 13:57:44 -0000	1.21
+++ .cvsignore	21 Feb 2008 15:51:15 -0000	1.22
@@ -1,2 +1 @@
-poppler-0.6.4.tar.gz
-poppler-data-0.2.0.tar.gz
+poppler-0.7.0.tar.gz

poppler-ObjStream.patch:

Index: poppler-ObjStream.patch
===================================================================
RCS file: /cvs/extras/rpms/poppler/devel/poppler-ObjStream.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- poppler-ObjStream.patch	18 Feb 2008 18:01:31 -0000	1.2
+++ poppler-ObjStream.patch	21 Feb 2008 15:51:15 -0000	1.3
@@ -1,6 +1,6 @@
-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
+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
 @@ -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.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
+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
 @@ -50,34 +50,9 @@
  // ObjectStream
  //------------------------------------------------------------------------


Index: poppler.spec
===================================================================
RCS file: /cvs/extras/rpms/poppler/devel/poppler.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- poppler.spec	19 Feb 2008 10:24:57 -0000	1.60
+++ poppler.spec	21 Feb 2008 15:51:15 -0000	1.61
@@ -2,8 +2,8 @@
 
 Summary: PDF rendering library
 Name: poppler
-Version: 0.6.4
-Release: 4%{?dist}
+Version: 0.7.0
+Release: 1%{?dist}
 License: GPLv2 and Redistributable, no modification permitted
 # the code is GPLv2
 # the charmap data in /usr/share/poppler is redistributable
@@ -12,6 +12,7 @@
 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
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: gtk2-devel
@@ -111,6 +112,7 @@
 %prep
 %setup -c -q -a1
 %patch0 -p1 -b .objstream
+%patch1 -p1 -b .fix-qt4-build
 
 %build
 ( cd  %{name}-%{version}
@@ -195,6 +197,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Feb 21 2008 Matthias Clasen <mclasen at redhat.com> - 0.7.0-1
+- Update to 0.7.0
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.6.4-4
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/poppler/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	29 Jan 2008 13:57:44 -0000	1.21
+++ sources	21 Feb 2008 15:51:15 -0000	1.22
@@ -1,2 +1,2 @@
-13d12ca4e349574cfbbcf4a9b2b3ae52  poppler-0.6.4.tar.gz
+9279f8997fefc11dcfdd2dcdb3c7a28c  poppler-0.7.0.tar.gz
 b7f98e84a4d2a2c794271d746ec7ee0b  poppler-data-0.2.0.tar.gz