X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=poppler.spec;h=f103df8e32cb81a0b453746ff42a7e1782a78b37;hb=1939ef98f30c384b670344f094d0463d2f72656b;hp=b318eedd2678d3346646220bf3ff4663da3bcab4;hpb=b24354dca4af88aebecc9878ba9c6cdbf05e5f75;p=packages%2Fpoppler.git

diff --git a/poppler.spec b/poppler.spec
index b318eed..69ec6a4 100644
--- a/poppler.spec
+++ b/poppler.spec
@@ -1,41 +1,65 @@
 #
 # Conditional build:
-%bcond_without	apidocs # disable gtk-doc 
+%bcond_without	apidocs # disable gtk-doc
 %bcond_without	cairo	# disable Cairo backend
-%bcond_without	qt	# disable qt wrapper
 %bcond_without	qt4	# disable qt4 wrapper
-#
-%define		cairo_ver	1.4.0
-#
+%bcond_without	qt5	# disable qt5 wrapper
+%bcond_without	cpp	# disable cpp wrapper
+%bcond_without	glib	# disable glib wrapper
+
+%define		cairo_ver	1.10.0
 Summary:	PDF rendering library
 Summary(pl.UTF-8):	Biblioteka renderująca PDF
 Name:		poppler
-Version:	0.8.2
+Version:	0.32.0
 Release:	1
 License:	GPL v2+
 Group:		Libraries
-Source0:	http://poppler.freedesktop.org/%{name}-%{version}.tar.gz
-# Source0-md5:	f8fb8fd26e831275b91a512c1ff56023
-Patch0:		%{name}-qt4.patch
+Source0:	http://poppler.freedesktop.org/%{name}-%{version}.tar.xz
+# Source0-md5:	a97985f7af6c388e42a53dead85d4ef4
+Patch0:		%{name}-qt5.patch
 URL:		http://poppler.freedesktop.org/
-%{?with_qt4:BuildRequires:	QtGui-devel >= 4.1.0}
-%{?with_qt4:BuildRequires:	QtXml-devel >= 4.1.0}
-%{?with_qt4:BuildRequires:	QtTest-devel >= 4.1.0}
-%{?with_qt4:BuildRequires:	qt4-build}
+%{?with_qt5:BuildRequires:	Qt5Core-devel >= 5.0.0}
+%{?with_qt5:BuildRequires:	Qt5Gui-devel >= 5.0.0}
+%{?with_qt5:BuildRequires:	Qt5Test-devel >= 5.0.0}
+%{?with_qt5:BuildRequires:	Qt5Widgets-devel >= 5.0.0}
+%{?with_qt5:BuildRequires:	Qt5Xml-devel >= 5.0.0}
+%{?with_qt4:BuildRequires:	QtCore-devel >= 4.7.0}
+%{?with_qt4:BuildRequires:	QtGui-devel >= 4.7.0}
+%{?with_qt4:BuildRequires:	QtTest-devel >= 4.7.0}
+%{?with_qt4:BuildRequires:	QtXml-devel >= 4.7.0}
 BuildRequires:	autoconf >= 2.59
-BuildRequires:	automake
+BuildRequires:	automake >= 1:1.7
 %{?with_cairo:BuildRequires:	cairo-devel >= %{cairo_ver}}
-BuildRequires:	fontconfig-devel
+BuildRequires:	curl-devel
+BuildRequires:	docbook-dtd412-xml
+BuildRequires:	fontconfig-devel >= 2.0.0
 BuildRequires:	freetype-devel >= 2.0
-BuildRequires:	gtk+2-devel >= 2:2.8.0
-%{?with_apidocs:BuildRequires:	gtk-doc >= 1.0}
+BuildRequires:	gettext-tools
+%{?with_glib:BuildRequires:	glib2-devel >= 1:2.18.0}
+BuildRequires:	gobject-introspection-devel >= 0.6.7
+%{?with_apidocs:BuildRequires:	gtk-doc >= 1.14}
+BuildRequires:	lcms2-devel >= 2
 BuildRequires:	libjpeg-devel
+BuildRequires:	libpng-devel
 BuildRequires:	libstdc++-devel
-BuildRequires:	libxml2-devel >= 2.0
+BuildRequires:	libtiff-devel
 BuildRequires:	libtool >= 2:1.5
-BuildRequires:	pkgconfig
-%{?with_qt:BuildRequires:	qt-devel >= 3.0}
+BuildRequires:	libxml2-devel >= 2.0
+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 >= 4.4.0}
+%{?with_qt5:BuildRequires:	qt5-build >= 5.0.0}
+BuildRequires:	sed >= 4.0
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	which
+BuildRequires:	xz
 BuildRequires:	zlib-devel
+Requires:	openjpeg >= 1.5
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -51,9 +75,16 @@ Summary:	Poppler header files
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki Poppler
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	fontconfig-devel
+Requires:	curl-devel
+Requires:	fontconfig-devel >= 2.0.0
 Requires:	freetype-devel >= 2.0
+Requires:	lcms2-devel >= 2
+Requires:	libjpeg-devel
+Requires:	libpng-devel
 Requires:	libstdc++-devel
+Requires:	libtiff-devel
+Requires:	openjpeg-devel >= 1.5
+Requires:	zlib-devel
 
 %description devel
 Header files for the Poppler library.
@@ -73,13 +104,65 @@ Poppler static libraries.
 %description static -l pl.UTF-8
 Statyczne biblioteki Poppler.
 
+%package apidocs
+Summary:	Poppler library API documentation
+Summary(pl.UTF-8):	Dokumentacja API biblioteki Poppler
+Group:		Documentation
+Requires:	gtk-doc-common
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
+
+%description apidocs
+Poppler library API documentation.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API biblioteki Poppler.
+
+%package cpp
+Summary:	Cpp wrapper for poppler
+Summary(pl.UTF-8):	Wrapper cpp dla popplera
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description cpp
+Cpp wrapper for poppler.
+
+%description cpp -l pl.UTF-8
+Wrapper cpp dla popplera.
+
+%package cpp-devel
+Summary:	Header files for cpp wrapper for poppler
+Summary(pl.UTF-8):	Pliki nagłówkowe wrappera cpp dla popplera
+Group:		Development/Libraries
+Requires:	%{name}-cpp = %{version}-%{release}
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description cpp-devel
+Header files for cpp wrapper for poppler.
+
+%description cpp-devel -l pl.UTF-8
+Pliki nagłówkowe wrappera cpp dla popplera.
+
+%package cpp-static
+Summary:	Static version of cpp wrapper for poppler
+Summary(pl.UTF-8):	Statyczna wersja wrappera cpp dla popplera
+Group:		Development/Libraries
+Requires:	%{name}-cpp-devel = %{version}-%{release}
+
+%description cpp-static
+Static version of cpp wrapper for poppler.
+
+%description cpp-static -l pl.UTF-8
+Statyczna wersja wrappera cpp dla popplera.
+
 %package glib
 Summary:	GLib wrapper for poppler
 Summary(pl.UTF-8):	Wrapper GLib dla popplera
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 %{?with_cairo:Requires:	cairo >= %{cairo_ver}}
-Requires:	gtk+2 >= 2:2.8.0
+Requires:	glib2 >= 1:2.18.0
 
 %description glib
 GLib wrapper for poppler.
@@ -94,7 +177,7 @@ Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 Requires:	%{name}-glib = %{version}-%{release}
 %{?with_cairo:Requires:	cairo-devel >= %{cairo_ver}}
-Requires:	gtk+2-devel >= 2:2.8.0
+Requires:	glib2-devel >= 1:2.18.0
 
 %description glib-devel
 Header files for GLib wrapper for poppler.
@@ -114,82 +197,98 @@ 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
+%package qt4
+Summary:	Qt4 wrapper for poppler
+Summary(pl.UTF-8):	Wrapper Qt4 dla popplera
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	QtCore >= 4.4.0
+Requires:	QtGui >= 4.4.0
+Requires:	QtXml >= 4.4.0
+Provides:	poppler-Qt = %{version}-%{release}
+Obsoletes:	poppler-Qt < 0.24.4-2
+Obsoletes:	poppler-qt
+
+%description qt4
+Qt4 wrapper for poppler.
 
-%description qt
-Qt wrapper for poppler.
-
-%description qt -l pl.UTF-8
-Wrapper Qt dla popplera.
+%description qt4 -l pl.UTF-8
+Wrapper Qt4 dla popplera.
 
-%package qt-devel
-Summary:	Header files for Qt wrapper for poppler
-Summary(pl.UTF-8):	Pliki nagłówkowe wrappera Qt dla popplera
+%package qt4-devel
+Summary:	Header files for Qt4 wrapper for poppler
+Summary(pl.UTF-8):	Pliki nagłówkowe wrappera Qt4 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.
+Requires:	%{name}-qt4 = %{version}-%{release}
+Requires:	QtCore-devel >= 4.4.0
+Requires:	QtGui-devel >= 4.4.0
+Requires:	QtXml-devel >= 4.4.0
+Provides:	poppler-Qt-devel = %{version}-%{release}
+Obsoletes:	poppler-Qt-devel < 0.24.4-2
+Obsoletes:	poppler-qt-devel
+
+%description qt4-devel
+Header files for Qt4 wrapper for poppler.
 
-%description qt-devel -l pl.UTF-8
-Pliki nagłówkowe wrappera Qt dla popplera.
+%description qt4-devel -l pl.UTF-8
+Pliki nagłówkowe wrapper Qt4 dla popplera.
 
-%package qt-static
-Summary:	Static version of Qt wrapper for poppler
-Summary(pl.UTF-8):	Statyczna wersja wrappera Qt dla popplera
+%package qt4-static
+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}
+Requires:	%{name}-qt4-devel = %{version}-%{release}
+Provides:	poppler-Qt-static = %{version}-%{release}
+Obsoletes:	poppler-Qt-static < 0.24.4-2
+Obsoletes:	poppler-qt-static
 
-%description qt-static
-Static version of Qt wrapper for poppler.
+%description qt4-static
+Static version of Qt4 wrapper for poppler.
 
-%description qt-static -l pl.UTF-8
-Statyczna wersja wrappera Qt dla popplera.
+%description qt4-static -l pl.UTF-8
+Statyczna wersja wrappera Qt4 dla popplera.
 
-%package Qt
-Summary:	Qt4 wrapper for poppler
-Summary(pl.UTF-8):	Wrapper Qt4 dla popplera
+%package qt5
+Summary:	Qt5 wrapper for poppler
+Summary(pl.UTF-8):	Wrapper Qt5 dla popplera
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 
-%description Qt
-Qt4 wrapper for poppler.
+%description qt5
+Qt5 wrapper for poppler.
 
-%description Qt -l pl.UTF-8
-Wrapper Qt4 dla popplera.
+%description qt5 -l pl.UTF-8
+Wrapper Qt5 dla popplera.
 
-%package Qt-devel
-Summary:	Header files for Qt4 wrapper for poppler
-Summary(pl.UTF-8):	Pliki nagłówkowe wrappera Qt4 dla popplera
+%package qt5-devel
+Summary:	Header files for Qt5 wrapper for poppler
+Summary(pl.UTF-8):	Pliki nagłówkowe wrappera Qt5 dla popplera
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
-Requires:	%{name}-Qt = %{version}-%{release}
-Requires:	QtGui-devel
-Requires:	QtXml-devel
+Requires:	%{name}-qt5 = %{version}-%{release}
+Requires:	Qt5Core-devel >= 5.0.0
+Requires:	Qt5Gui-devel >= 5.0.0
+Requires:	Qt5Widgets-devel >= 5.0.0
+Requires:	Qt5Xml-devel >= 5.0.0
 
-%description Qt-devel
-Header files for Qt4 wrapper for poppler.
+%description qt5-devel
+Header files for Qt5 wrapper for poppler.
 
-%description Qt-devel -l pl.UTF-8
-Pliki nagłówkowe wrapper Qt4 dla popplera.
+%description qt5-devel -l pl.UTF-8
+Pliki nagłówkowe wrapper Qt5 dla popplera.
 
-%package Qt-static
-Summary:	Static version of Qt4 wrapper for poppler
-Summary(pl.UTF-8):	Statyczna wersja wrappera Qt4 dla popplera
+%package qt5-static
+Summary:	Static version of Qt5 wrapper for poppler
+Summary(pl.UTF-8):	Statyczna wersja wrappera Qt5 dla popplera
 Group:		Development/Libraries
-Requires:	%{name}-Qt-devel = %{version}-%{release}
+Requires:	%{name}-qt5-devel = %{version}-%{release}
 
-%description Qt-static
-Static version of Qt4 wrapper for poppler.
+%description qt5-static
+Static version of Qt5 wrapper for poppler.
 
-%description Qt-static -l pl.UTF-8
-Statyczna wersja wrappera Qt4 dla popplera.
+%description qt5-static -l pl.UTF-8
+Statyczna wersja wrappera Qt5 dla popplera.
 
 %package progs
 Summary:	Set of tools for viewing information and converting PDF files
@@ -198,21 +297,21 @@ Group:		Applications/Publishing
 Provides:	pdftops
 Obsoletes:	pdftohtml
 Obsoletes:	pdftohtml-pdftops
-Obsoletes:	xpdf-tools
 Obsoletes:	poppler-utils
+Obsoletes:	xpdf-tools
 
 %description progs
 Package contains utilites for PDF files. These utilities allow to
-- extract information about PDF files
-- extract images from PDF files
-- convert PDF files to HTML, plain text and PS formats
+- extract information about PDF files,
+- extract images from PDF files,
+- convert PDF files to HTML, plain text and PS formats.
 
 %description progs -l pl.UTF-8
 Pakiet zawiera zestaw narzędzi do plików PDF. Programy te umożliwiają
-- wyświetlanie informacji o plikach PDF
-- wydobywanie obrazków z plików PDF
-- konwersję plików PDF do formatów takich jak HTML, PS czy też czystego
-  tekstu
+- wyświetlanie informacji o plikach PDF,
+- wydobywanie obrazków z plików PDF,
+- konwersję plików PDF do formatów takich jak HTML, PS czy też
+  czystego tekstu.
 
 %prep
 %setup -q
@@ -226,16 +325,22 @@ Pakiet zawiera zestaw narzędzi do plików PDF. Programy te umożliwiają
 %{__autoheader}
 %{__automake}
 %configure \
-	QTINC=/usr/include/qt \
-	QTLIB=%{_libdir} \
+	MOCQT4=/usr/bin/moc-qt4 \
+	MOCQT5=/usr/bin/moc-qt5 \
+	--disable-gtk-test \
+	--enable-libcurl \
+	%{?with_apidocs:--enable-gtk-doc} \
 	%{!?with_cairo:--disable-cairo-output} \
-	%{!?with_qt:--disable-poppler-qt} \
+	%{!?with_cpp:--disable-poppler-cpp} \
+	%{!?with_glib:--disable-poppler-glib} \
 	%{!?with_qt4:--disable-poppler-qt4} \
-	--enable-a4-paper \
-	%{?with_apidocs:--enable-gtk-doc} \
+	%{!?with_qt5:--disable-poppler-qt5} \
+	--disable-silent-rules \
 	--enable-xpdf-headers \
 	--enable-zlib \
+	--enable-dependency-tracking \
 	--with-html-dir=%{_gtkdocdir}
+
 %{__make}
 
 %install
@@ -244,100 +349,130 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%if %{without apidocs}
+# why it still installs them, brr
+%{__rm} -rf $RPM_BUILD_ROOT%{_gtkdocdir}/poppler || :
+%endif
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
+%post	cpp -p /sbin/ldconfig
+%postun	cpp -p /sbin/ldconfig
+
 %post	glib -p /sbin/ldconfig
 %postun	glib -p /sbin/ldconfig
 
-%post	qt -p /sbin/ldconfig
-%postun	qt -p /sbin/ldconfig
+%post	qt4 -p /sbin/ldconfig
+%postun	qt4 -p /sbin/ldconfig
 
-%post	Qt -p /sbin/ldconfig
-%postun	Qt -p /sbin/ldconfig
+%post	qt5 -p /sbin/ldconfig
+%postun	qt5 -p /sbin/ldconfig
 
 %files
 %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.3
+%attr(755,root,root) %ghost %{_libdir}/libpoppler.so.51
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpoppler.so
-%{_libdir}/libpoppler.la
 %dir %{_includedir}/poppler
 %{_includedir}/poppler/poppler-config.h
-%{_includedir}/poppler/[ABCDEFGJLMNOPSTUX]*.h
-%{_includedir}/poppler/Function.cc
+%{_includedir}/poppler/[ABCDEFGHJLMNOPRSTUVX]*.h
+%{_includedir}/poppler/fofi
 %{_includedir}/poppler/goo
 %{_includedir}/poppler/splash
-%exclude %{_includedir}/poppler/glib
 %{_pkgconfigdir}/poppler.pc
 %{?with_cairo:%{_pkgconfigdir}/poppler-cairo.pc}
 %{_pkgconfigdir}/poppler-splash.pc
 
-%{_gtkdocdir}/poppler
-
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libpoppler.a
 
+%if %{with apidocs}
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/poppler
+%endif
+
+%if %{with cpp}
+%files cpp
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libpoppler-cpp.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpoppler-cpp.so.0
+
+%files cpp-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libpoppler-cpp.so
+%{_includedir}/poppler/cpp
+%{_pkgconfigdir}/poppler-cpp.pc
+
+%files cpp-static
+%defattr(644,root,root,755)
+%{_libdir}/libpoppler-cpp.a
+%endif
+
+%if %{with glib}
 %files glib
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpoppler-glib.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpoppler-glib.so.3
+%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
-%{_libdir}/libpoppler-glib.la
 %{_includedir}/poppler/glib
 %{_pkgconfigdir}/poppler-glib.pc
+%{_datadir}/gir-1.0/Poppler-0.18.gir
 
 %files glib-static
 %defattr(644,root,root,755)
 %{_libdir}/libpoppler-glib.a
-
-%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.2
-
-%files qt-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libpoppler-qt.so
-%{_libdir}/libpoppler-qt.la
-%{_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
+%files qt4
 %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
+%files qt4-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpoppler-qt4.so
-%{_libdir}/libpoppler-qt4.la
 %{_includedir}/poppler/qt4
 %{_pkgconfigdir}/poppler-qt4.pc
 
-%files Qt-static
+%files qt4-static
 %defattr(644,root,root,755)
 %{_libdir}/libpoppler-qt4.a
 %endif
 
+%if %{with qt5}
+%files qt5
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libpoppler-qt5.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpoppler-qt5.so.1
+
+%files qt5-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libpoppler-qt5.so
+%{_includedir}/poppler/qt5
+%{_pkgconfigdir}/poppler-qt5.pc
+
+%files qt5-static
+%defattr(644,root,root,755)
+%{_libdir}/libpoppler-qt5.a
+%endif
+
 %files progs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/pdf*