[meego-commits] 6036: Changes to Trunk:Testing/poppler

[Zhang Qiang]

Hi,
I have made the following changes to poppler in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Zhang Qiang

[This message was auto-generated]

---

Request #6036:

  submit:   home:xiaoqiang:branches:Trunk:Testing/poppler(r10)(cleanup) -> Trunk:Testing/poppler


Message:
    Update to 0.14.1, remove following useless patches.

State:   new          2010-07-27T15:23:41 xiaoqiang
Comment: None



changes files:
--------------
--- poppler.changes
+++ poppler.changes
@@ -0,0 +1,4 @@
+* Wed Jul 28 2010 Zhang Qiang <qiang.z.zhang at intel.com> - 0.14.1
+- Update to 0.14.1, remove following useless patches: 
+  poppler-0.12.1-CVE-2009-3607.patch and poppler-0.12.1-objstream.patch
+

old:
----
  poppler-0.12.1-CVE-2009-3607.patch
  poppler-0.12.1-objstream.patch
  poppler-0.12.1.tar.gz

new:
----
  poppler-0.14.1.tar.gz

spec files:
-----------
--- poppler.spec
+++ poppler.spec
@@ -2,15 +2,13 @@
 
 Summary: PDF rendering library
 Name: poppler
-Version: 0.12.1
+Version: 0.14.1
 Release: 1
 License: GPLv2
 Group: System/Libraries
 URL:     http://poppler.freedesktop.org/
 Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.gz
 # for texlive/pdftex, TODO: upstream
-Patch0: poppler-0.12.1-objstream.patch
-Patch1: poppler-0.12.1-CVE-2009-3607.patch
 Patch2: poppler-0.12.1-CVE-2009-3938.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -116,8 +114,6 @@
 %prep
 %setup -q 
 
-%patch0 -p1 -b .objstream
-%patch1 -p1 -b .CVE-2009-3607
 %patch2 -p1 -b .CVE-2009-3938
 # hammer to nuke rpaths, recheck on new releases
 
@@ -127,7 +123,7 @@
 %if %enable_qt
 unset QTDIR && . /etc/profile.d/qt.sh
 %endif
-%reconfigure \
+%configure \
   --disable-static \
   --enable-cairo-output \
   --enable-libjpeg \
@@ -137,8 +133,8 @@
   --enable-poppler-qt4 \
 %endif
   --enable-xpdf-headers \
-  --disable-zlib
-
+  --disable-zlib        \
+  --disable-poppler-cpp
 make %{?_smp_mflags}
 
 
@@ -175,7 +171,7 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
-%{_libdir}/libpoppler.so.5*
+%{_libdir}/libpoppler.so.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -187,7 +183,7 @@
 
 %files glib
 %defattr(-,root,root,-)
-%{_libdir}/libpoppler-glib.so.4*
+%{_libdir}/libpoppler-glib.so.5*
 
 %files glib-devel
 %defattr(-,root,root,-)
@@ -221,5 +217,3 @@
 %defattr(-,root,root,-)
 %{_bindir}/*
 %{_mandir}/man1/*
-
-

other changes:
--------------

++++++ poppler-0.12.1.tar.gz -> poppler-0.14.1.tar.gz
51890 lines of diff (skipped)

++++++ deleted files:
--- poppler-0.12.1-CVE-2009-3607.patch
--- poppler-0.12.1-objstream.patch