diff --git a/.cvsignore b/.cvsignore index 8ebf1ce..8addc69 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -poppler-0.11.3.tar.gz +poppler-0.12.0.tar.gz diff --git a/poppler-0.11.0-pkg_config.patch b/poppler-0.11.0-pkg_config.patch deleted file mode 100644 index 9822d78..0000000 --- a/poppler-0.11.0-pkg_config.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -up poppler-0.11.0/poppler-qt4.pc.cmake.pkg_config poppler-0.11.0/poppler-qt4.pc.cmake ---- poppler-0.11.0/poppler-qt4.pc.cmake.pkg_config 2008-11-08 13:00:30.000000000 -0600 -+++ poppler-0.11.0/poppler-qt4.pc.cmake 2009-06-22 15:34:59.608531558 -0500 -@@ -6,7 +6,8 @@ includedir=${prefix}/include - Name: poppler-qt4 - Description: Qt4 bindings for poppler - Version: @POPPLER_VERSION@ --Requires: poppler = @POPPLER_VERSION@ -+Requires: @PC_REQUIRES@ -+@PC_REQUIRES_PRIVATE@ - - Libs: -L${libdir} -lpoppler-qt4 - Cflags: -I${includedir}/poppler/qt4 -diff -up poppler-0.11.0/poppler-qt4.pc.in.pkg_config poppler-0.11.0/poppler-qt4.pc.in ---- poppler-0.11.0/poppler-qt4.pc.in.pkg_config 2008-11-08 13:00:30.000000000 -0600 -+++ poppler-0.11.0/poppler-qt4.pc.in 2009-06-22 15:34:10.322280523 -0500 -@@ -6,7 +6,8 @@ includedir=@includedir@ - Name: poppler-qt4 - Description: Qt4 bindings for poppler - Version: @VERSION@ --Requires: poppler = @VERSION@ -+Requires: @PC_REQUIRES@ -+@PC_REQUIRES_PRIVATE@ - - Libs: -L${libdir} -lpoppler-qt4 - Cflags: -I${includedir}/poppler/qt4 -diff -up poppler-0.11.0/poppler-qt.pc.cmake.pkg_config poppler-0.11.0/poppler-qt.pc.cmake ---- poppler-0.11.0/poppler-qt.pc.cmake.pkg_config 2008-11-08 13:00:30.000000000 -0600 -+++ poppler-0.11.0/poppler-qt.pc.cmake 2009-06-22 15:34:47.330283449 -0500 -@@ -6,7 +6,8 @@ includedir=${prefix}/include - Name: poppler-qt - Description: Qt bindings for poppler - Version: @POPPLER_VERSION@ --Requires: poppler = @POPPLER_VERSION@ -+Requires: @PC_REQUIRES@ -+@PC_REQUIRES_PRIVATE@ - - Libs: -L${libdir} -lpoppler-qt - Cflags: -I${includedir}/poppler/qt3 -diff -up poppler-0.11.0/poppler-qt.pc.in.pkg_config poppler-0.11.0/poppler-qt.pc.in ---- poppler-0.11.0/poppler-qt.pc.in.pkg_config 2008-11-08 13:00:30.000000000 -0600 -+++ poppler-0.11.0/poppler-qt.pc.in 2009-06-22 15:33:33.570301915 -0500 -@@ -6,7 +6,8 @@ includedir=@includedir@ - Name: poppler-qt - Description: Qt bindings for poppler - Version: @VERSION@ --Requires: poppler = @VERSION@ -+Requires: @PC_REQUIRES@ -+@PC_REQUIRES_PRIVATE@ - - Libs: -L${libdir} -lpoppler-qt - Cflags: -I${includedir}/poppler/qt3 diff --git a/poppler.spec b/poppler.spec index 9a7946b..a211b2c 100644 --- a/poppler.spec +++ b/poppler.spec @@ -1,7 +1,7 @@ Summary: PDF rendering library Name: poppler -Version: 0.11.3 +Version: 0.12.0 Release: 1%{?dist} License: GPLv2 Group: Development/Libraries @@ -11,9 +11,6 @@ Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.gz Patch0: poppler-ObjStream.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -# reduce lib deps in -qt/-qt4 pkg-config support -Patch50: poppler-0.11.0-pkg_config.patch - BuildRequires: automake libtool BuildRequires: cairo-devel BuildRequires: gtk2-devel @@ -116,7 +113,6 @@ converting PDF files to a number of other formats. %setup -q %patch0 -p0 -b .objstream -%patch50 -p1 -b .pkg_config # hammer to nuke rpaths, recheck on new releases autoreconf -i -f @@ -215,6 +211,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Sep 09 2009 Rex Dieter - 0.12.0-1 +- Update to 0.12.0 + * Tue Aug 18 2009 Rex Dieter - 0.11.3-1 - Update to 0.11.3 diff --git a/sources b/sources index 404d5b1..5cd15e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -28f9dbdc74e9aadbf27aff16d06f4990 poppler-0.11.3.tar.gz +399b25d9d71ad22bc9a2a9281769c49c poppler-0.12.0.tar.gz