- updated to 0.22.0 (note: new libpoppler soname)

[packages/poppler0.61.git] / poppler.spec

diff --git a/poppler.spec b/poppler.spec
index 32143c5cbf6c7fbd6f28c877971458402944609a..019c30d747635e38f88107d7a440bdb01cdc7c49 100644 (file)
--- a/poppler.spec
+++ b/poppler.spec
@@ -1,6 +1,3 @@
-# TODO
-# - qt and Qt packages make file collisions on case insensitive filesystems,
-#   consider adding version suffix to either of the pckages
 #
 # Conditional build:
 %bcond_without apidocs # disable gtk-doc
@@ -8,19 +5,19 @@
 %bcond_without qt4     # disable qt4 wrapper
 %bcond_without cpp     # disable cpp wrapper
 %bcond_without glib    # disable glib wrapper
-%bcond_without gdk     # disable gdk support in glib wrapper
 #
 %define                cairo_ver       1.10.0
 #
 Summary:       PDF rendering library
 Summary(pl.UTF-8):     Biblioteka renderująca PDF
 Name:          poppler
-Version:       0.18.1
-Release:       3
+Version:       0.22.0
+Release:       1
 License:       GPL v2+
 Group:         Libraries
 Source0:       http://poppler.freedesktop.org/%{name}-%{version}.tar.gz
-# Source0-md5: d30e883a27423c936ef338ce1d967e2d
+# Source0-md5: c7038be37a7d446544e83a7df3c26196
+Patch0:                %{name}-am.patch
 URL:           http://poppler.freedesktop.org/
 %{?with_qt4:BuildRequires:     QtGui-devel >= 4.4.0}
 %{?with_qt4:BuildRequires:     QtTest-devel >= 4.4.0}
@@ -36,18 +33,24 @@ BuildRequires:      gettext-devel
 %{?with_glib:BuildRequires:    glib2-devel >= 1:2.18.0}
 BuildRequires: gobject-introspection-devel >= 0.6.7
 %{?with_apidocs:BuildRequires: gtk-doc >= 1.14}
-%{?with_gdk:BuildRequires:     gtk+2-devel}
-BuildRequires: lcms-devel
+BuildRequires: lcms2-devel
 BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
 BuildRequires: libstdc++-devel
+BuildRequires: libtiff-devel
 BuildRequires: libtool >= 2:1.5
 BuildRequires: libxml2-devel >= 2.0
-BuildRequires: openjpeg-devel
+BuildRequires: openjpeg-devel >= 1.5
 BuildRequires: pkgconfig >= 1:0.18
+# wanted cairo backends
+BuildRequires: pkgconfig(cairo-pdf) >= %{cairo_ver}
+BuildRequires: pkgconfig(cairo-ps) >= %{cairo_ver}
+BuildRequires: pkgconfig(cairo-svg) >= %{cairo_ver}
 %{?with_qt4:BuildRequires:     qt4-build}
 BuildRequires: sed >= 4.0
 BuildRequires: which
 BuildRequires: zlib-devel
+Requires:      openjpeg >= 1.5
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -63,11 +66,16 @@ Summary:    Poppler header files
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki Poppler
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      curl-devel
 Requires:      fontconfig-devel >= 2.0.0
 Requires:      freetype-devel >= 2.0
-Requires:      lcms-devel
+Requires:      lcms2-devel
+Requires:      libjpeg-devel
+Requires:      libpng-devel
 Requires:      libstdc++-devel
-Requires:      openjpeg-devel
+Requires:      libtiff-devel
+Requires:      openjpeg-devel >= 1.5
+Requires:      zlib-devel
 
 %description devel
 Header files for the Poppler library.
@@ -158,7 +166,6 @@ Requires:   %{name}-devel = %{version}-%{release}
 Requires:      %{name}-glib = %{version}-%{release}
 %{?with_cairo:Requires:        cairo-devel >= %{cairo_ver}}
 Requires:      glib2-devel >= 1:2.18.0
-%{?with_gdk:Provides:  poppler-glib-devel(gdk)}
 
 %description glib-devel
 Header files for GLib wrapper for poppler.
@@ -185,6 +192,7 @@ Group:              Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      QtGui >= 4.4.0
 Requires:      QtXml >= 4.4.0
+Obsoletes:     poppler-qt
 
 %description Qt
 Qt4 wrapper for poppler.
@@ -200,6 +208,7 @@ Requires:   %{name}-Qt = %{version}-%{release}
 Requires:      %{name}-devel = %{version}-%{release}
 Requires:      QtGui-devel >= 4.4.0
 Requires:      QtXml-devel >= 4.4.0
+Obsoletes:     poppler-qt-devel
 
 %description Qt-devel
 Header files for Qt4 wrapper for poppler.
@@ -212,6 +221,7 @@ Summary:    Static version of Qt4 wrapper for poppler
 Summary(pl.UTF-8):     Statyczna wersja wrappera Qt4 dla popplera
 Group:         Development/Libraries
 Requires:      %{name}-Qt-devel = %{version}-%{release}
+Obsoletes:     poppler-qt-static
 
 %description Qt-static
 Static version of Qt4 wrapper for poppler.
@@ -244,6 +254,7 @@ Pakiet zawiera zestaw narzędzi do plików PDF. Programy te umożliwiają
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{?with_apidocs:%{__gtkdocize}}
@@ -253,11 +264,11 @@ Pakiet zawiera zestaw narzędzi do plików PDF. Programy te umożliwiają
 %{__autoheader}
 %{__automake}
 %configure \
+       MOCQT4=/usr/bin/moc-qt4 \
        --disable-gtk-test \
        --enable-libcurl \
        %{?with_apidocs:--enable-gtk-doc} \
        %{!?with_cairo:--disable-cairo-output} \
-       %{!?with_gdk:--disable-gdk} \
        %{!?with_cpp:--disable-poppler-cpp} \
        %{!?with_glib:--disable-poppler-glib} \
        %{!?with_qt4:--disable-poppler-qt4} \
@@ -265,7 +276,7 @@ Pakiet zawiera zestaw narzędzi do plików PDF. Programy te umożliwiają
        --enable-xpdf-headers \
        --enable-zlib \
        --enable-dependency-tracking \
-       --with-html-dir=%{_gtkdocdir} 
+       --with-html-dir=%{_gtkdocdir}
 
 %{__make}
 
@@ -301,7 +312,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README* TODO
 %attr(755,root,root) %{_libdir}/libpoppler.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpoppler.so.19
+%attr(755,root,root) %ghost %{_libdir}/libpoppler.so.34
 
 %files devel
 %defattr(644,root,root,755)
@@ -366,7 +377,7 @@ rm -rf $RPM_BUILD_ROOT
 %files Qt
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpoppler-qt4.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpoppler-qt4.so.3
+%attr(755,root,root) %ghost %{_libdir}/libpoppler-qt4.so.4
 
 %files Qt-devel
 %defattr(644,root,root,755)