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

[Bernd Wachter]

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

Thank You,
Bernd Wachter

[This message was auto-generated]

---

Request #6589:

  submit:   home:bwachter:branches:Trunk:Testing/poppler(r2)(cleanup) -> Trunk:Testing/poppler


Message:
    enable qt-bindings, change to pkgconfig buildreq

State:   new          2010-08-13T01:21:28 bwachter
Comment: None



changes files:
--------------
--- poppler.changes
+++ poppler.changes
@@ -0,0 +1,5 @@
+* Fri Aug 13 2010 Bernd Wachter <ext-bernd.wachter at nokia.com> - 0.14.2
+- Update to version 0.14.2
+- Enable qt4 bindings
+- Change buildrequires to pkgconfig
+

old:
----
  poppler-0.14.1.tar.gz

new:
----
  poppler-0.14.2.tar.gz

spec files:
-----------
--- poppler.spec
+++ poppler.spec
@@ -1,8 +1,6 @@
-%define enable_qt 0
-
 Summary: PDF rendering library
 Name: poppler
-Version: 0.14.1
+Version: 0.14.2
 Release: 1
 License: GPLv2
 Group: System/Libraries
@@ -15,15 +13,12 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: automake libtool
-BuildRequires: cairo-devel
-BuildRequires: gtk2-devel
-BuildRequires: lcms-devel
+BuildRequires: pkgconfig(cairo)
+BuildRequires: pkgconfig(gtk+-2.0)
+BuildRequires: pkgconfig(lcms)
 BuildRequires: libjpeg-devel
 BuildRequires: openjpeg-devel >= 1.3-5
-%if %enable_qt
-BuildRequires: qt3-devel
-BuildRequires: qt4-devel
-%endif
+BuildRequires: qt-devel
 
 
 %description
@@ -58,9 +53,8 @@
 %description glib-devel
 %{summary}.
 
-%if %enable_qt
 %package qt
-Summary: Qt3 wrapper for poppler
+Summary: Qt4 wrapper for poppler
 Group:   System/Libraries
 Requires: %{name} = %{version}-%{release}
 
@@ -68,35 +62,15 @@
 %{summary}.
 
 %package qt-devel
-Summary: Development files for Qt3 wrapper
-Group:   Development/Libraries
-Requires: %{name}-qt = %{version}-%{release}
-Requires: %{name}-devel = %{version}-%{release}
-Requires: qt3-devel
-
-%description qt-devel
-%{summary}.
-
-%package qt4
-Summary: Qt4 wrapper for poppler
-Group:   System/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description qt4
-%{summary}.
-
-%package qt4-devel
 Summary: Development files for Qt4 wrapper
 Group:   Development/Libraries
 Requires: %{name}-qt4 = %{version}-%{release}
 Requires: %{name}-devel = %{version}-%{release}
-Requires: qt4-devel
+Requires: qt-devel
 
-%description qt4-devel
+%description qt-devel
 %{summary}.
 
-%endif
-
 %package utils
 Summary: Command line utilities for converting PDF files
 Group: Applications/Text
@@ -120,19 +94,12 @@
 
 
 %build
-# can use in a pinch, but isn't necessary (in general) -- Rex
-%if %enable_qt
-unset QTDIR && . /etc/profile.d/qt.sh
-%endif
 %configure \
   --disable-static \
   --enable-cairo-output \
   --enable-libjpeg \
   --enable-libopenjpeg \
-%if %enable_qt
-  --enable-poppler-qt \
   --enable-poppler-qt4 \
-%endif
   --enable-xpdf-headers \
   --disable-zlib        \
   --disable-poppler-cpp
@@ -154,17 +121,10 @@
 
 %postun glib -p /sbin/ldconfig
 
-%if %enable_qt
 %post qt -p /sbin/ldconfig
 
 %postun qt -p /sbin/ldconfig
 
-%post qt4 -p /sbin/ldconfig
-
-%postun qt4 -p /sbin/ldconfig
-%endif
-
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -180,6 +140,7 @@
 %{_libdir}/pkgconfig/poppler-splash.pc
 %{_libdir}/libpoppler.so
 %{_includedir}/poppler/
+%exclude %{_includedir}/poppler/qt4
 %{_datadir}/gtk-doc/html/poppler
 
 %files glib
@@ -192,30 +153,17 @@
 %{_libdir}/pkgconfig/poppler-cairo.pc
 %{_libdir}/libpoppler-glib.so
 
-%if %enable_qt
 %files qt
 %defattr(-,root,root,-)
-%{_libdir}/libpoppler-qt.so.2*
-
-%files qt-devel
-%defattr(-,root,root,-)
-%{_libdir}/libpoppler-qt.so
-%{_libdir}/pkgconfig/poppler-qt.pc
-%{_includedir}/poppler/qt3/
-
-%files qt4
-%defattr(-,root,root,-)
 %{_libdir}/libpoppler-qt4.so.3*
 
-%files qt4-devel
+%files qt-devel
 %defattr(-,root,root,-)
 %{_libdir}/libpoppler-qt4.so
 %{_libdir}/pkgconfig/poppler-qt4.pc
 %{_includedir}/poppler/qt4/
-%endif
 
 %files utils
 %defattr(-,root,root,-)
 %{_bindir}/*
 %{_mandir}/man1/*
-

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

++++++ poppler-0.14.1.tar.gz -> poppler-0.14.2.tar.gz
40942 lines of diff (skipped)