X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=poppler.spec;h=417bd17f2c8d1e1b13aab130ff4d09275bf4f643;hb=931ab1e2bd57aeb24fc85c22c49c74c6447a0342;hp=db9ab71e559b362e29156777a0134185b3423745;hpb=9148ca80de9d7f70d013d2956b50c77705800774;p=packages%2Fpoppler0.61.git

diff --git a/poppler.spec b/poppler.spec
index db9ab71..417bd17 100644
--- a/poppler.spec
+++ b/poppler.spec
@@ -1,21 +1,24 @@
 #
+# TODO: unpackaged files
+#
 # 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
+%bcond_without	cpp	# disable cpp wrapper
 #
 %define		cairo_ver	1.4.0
 #
 Summary:	PDF rendering library
 Summary(pl.UTF-8):	Biblioteka renderująca PDF
 Name:		poppler
-Version:	0.8.7
-Release:	1
+Version:	0.14.0
+Release:	2
 License:	GPL v2+
 Group:		Libraries
 Source0:	http://poppler.freedesktop.org/%{name}-%{version}.tar.gz
-# Source0-md5:	9af81429d6f8639c357a5eed25583365
+# Source0-md5:	76f003b8fa2b905674088c306aa857c5
 URL:		http://poppler.freedesktop.org/
 %{?with_qt4:BuildRequires:	QtGui-devel >= 4.1.0}
 %{?with_qt4:BuildRequires:	QtTest-devel >= 4.1.0}
@@ -23,17 +26,20 @@ URL:		http://poppler.freedesktop.org/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
 %{?with_cairo:BuildRequires:	cairo-devel >= %{cairo_ver}}
+BuildRequires:	docbook-dtd412-xml
 BuildRequires:	fontconfig-devel
 BuildRequires:	freetype-devel >= 2.0
-BuildRequires:	gtk+2-devel >= 2:2.8.0
+BuildRequires:	glib2-devel >= 1:2.6.0
 %{?with_apidocs:BuildRequires:	gtk-doc >= 1.0}
 BuildRequires:	libjpeg-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 2:1.5
 BuildRequires:	libxml2-devel >= 2.0
+BuildRequires:	openjpeg-devel
 BuildRequires:	pkgconfig
 %{?with_qt:BuildRequires:	qt-devel >= 3.0}
 %{?with_qt4:BuildRequires:	qt4-build}
+BuildRequires:	which
 BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -53,6 +59,7 @@ Requires:	%{name} = %{version}-%{release}
 Requires:	fontconfig-devel
 Requires:	freetype-devel >= 2.0
 Requires:	libstdc++-devel
+Requires:	openjpeg-devel
 
 %description devel
 Header files for the Poppler library.
@@ -84,13 +91,50 @@ 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.6.0
 
 %description glib
 GLib wrapper for poppler.
@@ -105,7 +149,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.6.0
 
 %description glib-devel
 Header files for GLib wrapper for poppler.
@@ -222,8 +266,8 @@ Package contains utilites for PDF files. These utilities allow to
 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
+- konwersję plików PDF do formatów takich jak HTML, PS czy też
+  czystego tekstu
 
 %prep
 %setup -q
@@ -236,15 +280,18 @@ Pakiet zawiera zestaw narzędzi do plików PDF. Programy te umożliwiają
 %{__autoheader}
 %{__automake}
 %configure \
-	QTINC=/usr/include/qt \
+	QTINC=%{_includedir}/qt \
 	QTLIB=%{_libdir} \
+	--disable-gtk-test \
 	%{!?with_cairo:--disable-cairo-output} \
 	%{!?with_qt:--disable-poppler-qt} \
 	%{!?with_qt4:--disable-poppler-qt4} \
+	%{!?with_cpp:--disable-poppler-cpp} \
 	--enable-a4-paper \
 	%{?with_apidocs:--enable-gtk-doc} \
 	--enable-xpdf-headers \
 	--enable-zlib \
+	--enable-dependency-tracking \
 	--with-html-dir=%{_gtkdocdir}
 
 %{__make}
@@ -279,7 +326,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.3
+%attr(755,root,root) %ghost %{_libdir}/libpoppler.so.6
 
 %files devel
 %defattr(644,root,root,755)
@@ -288,8 +335,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_includedir}/poppler
 %{_includedir}/poppler/poppler-config.h
 %{_includedir}/poppler/[ABCDEFGJLMNOPSTUX]*.h
-%{_includedir}/poppler/Function.cc
 %{_includedir}/poppler/goo
+%{_includedir}/poppler/fofi
 %{_includedir}/poppler/splash
 %exclude %{_includedir}/poppler/glib
 %{_pkgconfigdir}/poppler.pc
@@ -306,10 +353,26 @@ rm -rf $RPM_BUILD_ROOT
 %{_gtkdocdir}/poppler
 %endif
 
+%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
+%{_libdir}/libpoppler-cpp.la
+%{_includedir}/poppler/cpp
+%{_pkgconfigdir}/poppler-cpp.pc
+
+%files cpp-static
+%defattr(644,root,root,755)
+%{_libdir}/libpoppler-cpp.a
+
 %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.5
 
 %files glib-devel
 %defattr(644,root,root,755)