diff --git a/.cvsignore b/.cvsignore index 85c770e..1d512aa 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -poppler-0.6.4.tar.gz -poppler-data-0.2.0.tar.gz +poppler-0.7.0.tar.gz diff --git a/fix-qt4-build.patch b/fix-qt4-build.patch new file mode 100644 index 0000000..c843a8c --- /dev/null +++ b/fix-qt4-build.patch @@ -0,0 +1,12 @@ +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: diff --git a/poppler-ObjStream.patch b/poppler-ObjStream.patch index b2ad893..a2314e8 100644 --- a/poppler-ObjStream.patch +++ b/poppler-ObjStream.patch @@ -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 @@ diff -up poppler-0.6.4/poppler-0.6.4/poppler/XRef.h.objstream poppler-0.6.4/popp // 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 //------------------------------------------------------------------------ diff --git a/poppler.spec b/poppler.spec index bfca649..2461c8c 100644 --- a/poppler.spec +++ b/poppler.spec @@ -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 @@ 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 +Patch1: fix-qt4-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gtk2-devel @@ -111,6 +112,7 @@ converting PDF files to a number of other formats. %prep %setup -c -q -a1 %patch0 -p1 -b .objstream +%patch1 -p1 -b .fix-qt4-build %build ( cd %{name}-%{version} @@ -195,6 +197,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/* %changelog +* Thu Feb 21 2008 Matthias Clasen - 0.7.0-1 +- Update to 0.7.0 + * Tue Feb 19 2008 Fedora Release Engineering - 0.6.4-4 - Autorebuild for GCC 4.3 diff --git a/sources b/sources index e760f56..a611fd3 100644 --- a/sources +++ b/sources @@ -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