X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=poppler.spec;h=ea6dbf3f52bd1f25cd8e40bfb92864025b7d8045;hb=6cdda41a8dad991786b90afd95e8b55b5c144c3d;hp=b00850d0c4ddbac4e1580659789d929ed48f7faf;hpb=aa69a63f060469782a0fe68aa5d2d5534709906f;p=packages%2Fpoppler0.61.git diff --git a/poppler.spec b/poppler.spec index b00850d..ea6dbf3 100644 --- a/poppler.spec +++ b/poppler.spec @@ -1,11 +1,7 @@ -# 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 %bcond_without cairo # disable Cairo backend -%bcond_without qt # disable qt wrapper %bcond_without qt4 # disable qt4 wrapper %bcond_without cpp # disable cpp wrapper %bcond_without glib # disable glib wrapper @@ -15,12 +11,12 @@ Summary: PDF rendering library Summary(pl.UTF-8): Biblioteka renderująca PDF Name: poppler -Version: 0.16.7 -Release: 1 +Version: 0.18.3 +Release: 2 License: GPL v2+ Group: Libraries Source0: http://poppler.freedesktop.org/%{name}-%{version}.tar.gz -# Source0-md5: 3afa28e3c8c4f06b0fbca3c91e06394e +# Source0-md5: d70d2d63d8acd29c97185f7e5f09c9b4 URL: http://poppler.freedesktop.org/ %{?with_qt4:BuildRequires: QtGui-devel >= 4.4.0} %{?with_qt4:BuildRequires: QtTest-devel >= 4.4.0} @@ -38,12 +34,13 @@ BuildRequires: gobject-introspection-devel >= 0.6.7 %{?with_apidocs:BuildRequires: gtk-doc >= 1.14} BuildRequires: lcms-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: pkgconfig >= 1:0.18 -%{?with_qt:BuildRequires: qt-devel >= 3.0} %{?with_qt4:BuildRequires: qt4-build} BuildRequires: sed >= 4.0 BuildRequires: which @@ -63,11 +60,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: libjpeg-devel +Requires: libpng-devel Requires: libstdc++-devel +Requires: libtiff-devel Requires: openjpeg-devel +Requires: zlib-devel %description devel Header files for the Poppler library. @@ -177,44 +179,6 @@ Static version of GLib wrapper for poppler. %description glib-static -l pl.UTF-8 Statyczna wersja wrappera GLib dla popplera. -%package qt -Summary: Qt wrapper for poppler -Summary(pl.UTF-8): Wrapper Qt dla popplera -Group: Libraries -Requires: %{name} = %{version}-%{release} - -%description qt -Qt wrapper for poppler. - -%description qt -l pl.UTF-8 -Wrapper Qt dla popplera. - -%package qt-devel -Summary: Header files for Qt wrapper for poppler -Summary(pl.UTF-8): Pliki nagłówkowe wrappera Qt dla popplera -Group: Development/Libraries -Requires: %{name}-devel = %{version}-%{release} -Requires: %{name}-qt = %{version}-%{release} -Requires: qt-devel - -%description qt-devel -Header files for Qt wrapper for poppler. - -%description qt-devel -l pl.UTF-8 -Pliki nagłówkowe wrappera Qt dla popplera. - -%package qt-static -Summary: Static version of Qt wrapper for poppler -Summary(pl.UTF-8): Statyczna wersja wrappera Qt dla popplera -Group: Development/Libraries -Requires: %{name}-qt-devel = %{version}-%{release} - -%description qt-static -Static version of Qt wrapper for poppler. - -%description qt-static -l pl.UTF-8 -Statyczna wersja wrappera Qt dla popplera. - %package Qt Summary: Qt4 wrapper for poppler Summary(pl.UTF-8): Wrapper Qt4 dla popplera @@ -222,6 +186,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. @@ -237,6 +202,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. @@ -249,6 +215,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. @@ -282,9 +249,6 @@ Pakiet zawiera zestaw narzędzi do plików PDF. Programy te umożliwiają %prep %setup -q -# fix link with Qt 3 libraries -%{__sed} -i 's,(POPPLER_QT_LIBS),(libqt3_LIBS),' qt/Makefile.am - %build %{?with_apidocs:%{__gtkdocize}} %{__libtoolize} @@ -293,21 +257,18 @@ Pakiet zawiera zestaw narzędzi do plików PDF. Programy te umożliwiają %{__autoheader} %{__automake} %configure \ - QTINC=%{_includedir}/qt \ - QTLIB=%{_libdir} \ --disable-gtk-test \ --enable-libcurl \ %{?with_apidocs:--enable-gtk-doc} \ %{!?with_cairo:--disable-cairo-output} \ %{!?with_cpp:--disable-poppler-cpp} \ %{!?with_glib:--disable-poppler-glib} \ - %{!?with_qt:--disable-poppler-qt} \ %{!?with_qt4:--disable-poppler-qt4} \ --disable-silent-rules \ --enable-xpdf-headers \ --enable-zlib \ --enable-dependency-tracking \ - --with-html-dir=%{_gtkdocdir} + --with-html-dir=%{_gtkdocdir} %{__make} @@ -336,9 +297,6 @@ rm -rf $RPM_BUILD_ROOT %post glib -p /sbin/ldconfig %postun glib -p /sbin/ldconfig -%post qt -p /sbin/ldconfig -%postun qt -p /sbin/ldconfig - %post Qt -p /sbin/ldconfig %postun Qt -p /sbin/ldconfig @@ -346,14 +304,14 @@ 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.13 +%attr(755,root,root) %ghost %{_libdir}/libpoppler.so.19 %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libpoppler.so %dir %{_includedir}/poppler %{_includedir}/poppler/poppler-config.h -%{_includedir}/poppler/[ABCDEFGHJLMNOPRSTUX]*.h +%{_includedir}/poppler/[ABCDEFGHJLMNOPRSTUVX]*.h %{_includedir}/poppler/fofi %{_includedir}/poppler/goo %{_includedir}/poppler/splash @@ -392,38 +350,21 @@ rm -rf $RPM_BUILD_ROOT %files glib %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libpoppler-glib.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libpoppler-glib.so.6 -%{_libdir}/girepository-1.0/Poppler-0.16.typelib +%attr(755,root,root) %ghost %{_libdir}/libpoppler-glib.so.8 +%{_libdir}/girepository-1.0/Poppler-0.18.typelib %files glib-devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libpoppler-glib.so %{_includedir}/poppler/glib %{_pkgconfigdir}/poppler-glib.pc -%{_datadir}/gir-1.0/Poppler-0.16.gir +%{_datadir}/gir-1.0/Poppler-0.18.gir %files glib-static %defattr(644,root,root,755) %{_libdir}/libpoppler-glib.a %endif -%if %{with qt} -%files qt -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libpoppler-qt.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libpoppler-qt.so.3 - -%files qt-devel -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libpoppler-qt.so -%{_includedir}/poppler/qt3 -%{_pkgconfigdir}/poppler-qt.pc - -%files qt-static -%defattr(644,root,root,755) -%{_libdir}/libpoppler-qt.a -%endif - %if %{with qt4} %files Qt %defattr(644,root,root,755)