From 3b8ee1a8ff4813c649da4e8589c39840b3dd06cb Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 5 Aug 2008 21:18:29 +0000 Subject: [PATCH] - Update to 0.8.5 --- .cvsignore | 2 +- fix-qt4-build.patch | 24 ------------------------ poppler-ObjStream.patch | 12 ++++++------ poppler-qt3-check.patch | 6 +++--- poppler.spec | 11 +++++++---- sources | 3 +-- 6 files changed, 18 insertions(+), 40 deletions(-) delete mode 100644 fix-qt4-build.patch diff --git a/.cvsignore b/.cvsignore index e72758d..b19a91a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -poppler-0.8.3.tar.gz +poppler-0.8.5.tar.gz diff --git a/fix-qt4-build.patch b/fix-qt4-build.patch deleted file mode 100644 index 3d1859a..0000000 --- a/fix-qt4-build.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up poppler-0.8.3/poppler-0.8.3/qt4/Makefile.in.fix-qt4-build poppler-0.8.3/poppler-0.8.3/qt4/Makefile.in ---- poppler-0.8.3/poppler-0.8.3/qt4/Makefile.in.fix-qt4-build 20.8.32-21 10:29:14.000000000 -0500 -+++ poppler-0.8.3/poppler-0.8.3/qt4/Makefile.in 20.8.32-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 -up poppler-0.8.3/poppler-0.8.3/qt4/src/Makefile.in.qt4 poppler-0.8.3/poppler-0.8.3/qt4/src/Makefile.in ---- poppler-0.8.3/poppler-0.8.3/qt4/src/Makefile.in.qt4 20.8.32-28 23:28:27.000000000 -0500 -+++ poppler-0.8.3/poppler-0.8.3/qt4/src/Makefile.in 20.8.32-28 23:28:46.000000000 -0500 -@@ -635,7 +635,7 @@ SUFFIXES: .moc - - # This rule lets GNU make create any *.moc from the equivalent *.h - .h.moc: -- moc -i $< -o $@ -+ moc-qt4 -i $< -o $@ - - poppler-optcontent.lo: poppler-optcontent.moc - diff --git a/poppler-ObjStream.patch b/poppler-ObjStream.patch index cb1a35d..05948db 100644 --- a/poppler-ObjStream.patch +++ b/poppler-ObjStream.patch @@ -1,6 +1,6 @@ -diff -up poppler-0.8.3/poppler-0.8.3/poppler/XRef.h.objstream poppler-0.8.3/poppler-0.8.3/poppler/XRef.h ---- poppler-0.8.3/poppler-0.8.3/poppler/XRef.h.objstream 20.8.31-21 21:00:59.000000000 +0100 -+++ poppler-0.8.3/poppler-0.8.3/poppler/XRef.h 20.8.32-18 17:18:47.000000000 +0100 +diff -up poppler/XRef.h.objstream poppler-0.8.3/poppler-0.8.3/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 @@ diff -up poppler-0.8.3/poppler-0.8.3/poppler/XRef.h.objstream poppler-0.8.3/popp // Write access void setModifiedObject(Object* o, Ref r); -diff -up poppler-0.8.3/poppler-0.8.3/poppler/XRef.cc.objstream poppler-0.8.3/poppler-0.8.3/poppler/XRef.cc ---- poppler-0.8.3/poppler-0.8.3/poppler/XRef.cc.objstream 20.8.31-21 21:00:59.000000000 +0100 -+++ poppler-0.8.3/poppler-0.8.3/poppler/XRef.cc 20.8.32-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 //------------------------------------------------------------------------ diff --git a/poppler-qt3-check.patch b/poppler-qt3-check.patch index f7ffdc1..1a9d69d 100644 --- a/poppler-qt3-check.patch +++ b/poppler-qt3-check.patch @@ -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 diff --git a/poppler.spec b/poppler.spec index 07dd449..3198d59 100644 --- a/poppler.spec +++ b/poppler.spec @@ -2,7 +2,7 @@ Summary: PDF rendering library Name: poppler -Version: 0.8.3 +Version: 0.8.5 Release: 1%{?dist} License: GPLv2 and Redistributable, no modification permitted # the code is GPLv2 @@ -12,7 +12,6 @@ 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,8 +110,9 @@ converting PDF files to a number of other formats. %prep %setup -c -q -a1 -%patch0 -p1 -b .objstream -%patch1 -p1 -b .fix-qt4-build +pushd %{name}-%{version} +%patch0 -p0 -b .objstream +popd %build pushd %{name}-%{version} @@ -199,6 +199,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/* %changelog +* Tue Aug 05 2008 Colin Walters - 0.8.5-1 +- Update to 0.8.5 + * Wed Jun 4 2008 Matthias Clasen - 0.8.3-1 - Update to 0.8.3 diff --git a/sources b/sources index 6c68553..0cf36bc 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -d5631bdbde9dda89ff20796005ece4d4 poppler-0.8.3.tar.gz -b7f98e84a4d2a2c794271d746ec7ee0b poppler-data-0.2.0.tar.gz +00593d56340b4a635f4a34590c445800 poppler-0.8.5.tar.gz