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

diff --git a/poppler.spec b/poppler.spec
index b318eed..804842f 100644
--- a/poppler.spec
+++ b/poppler.spec
@@ -1,6 +1,6 @@
 #
 # 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
@@ -10,18 +10,16 @@
 Summary:	PDF rendering library
 Summary(pl.UTF-8):	Biblioteka renderująca PDF
 Name:		poppler
-Version:	0.8.2
+Version:	0.10.5
 Release:	1
 License:	GPL v2+
 Group:		Libraries
 Source0:	http://poppler.freedesktop.org/%{name}-%{version}.tar.gz
-# Source0-md5:	f8fb8fd26e831275b91a512c1ff56023
-Patch0:		%{name}-qt4.patch
+# Source0-md5:	125f671a19707861132fb03e73b61184
 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_qt4:BuildRequires:	QtXml-devel >= 4.1.0}
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
 %{?with_cairo:BuildRequires:	cairo-devel >= %{cairo_ver}}
@@ -31,10 +29,11 @@ BuildRequires:	gtk+2-devel >= 2:2.8.0
 %{?with_apidocs:BuildRequires:	gtk-doc >= 1.0}
 BuildRequires:	libjpeg-devel
 BuildRequires:	libstdc++-devel
-BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	libtool >= 2:1.5
+BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	pkgconfig
 %{?with_qt:BuildRequires:	qt-devel >= 3.0}
+%{?with_qt4:BuildRequires:	qt4-build}
 BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -73,6 +72,18 @@ 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
+
+%description apidocs
+Poppler library API documentation.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API biblioteki Poppler.
+
 %package glib
 Summary:	GLib wrapper for poppler
 Summary(pl.UTF-8):	Wrapper GLib dla popplera
@@ -168,8 +179,8 @@ Wrapper Qt4 dla popplera.
 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:	%{name}-devel = %{version}-%{release}
 Requires:	QtGui-devel
 Requires:	QtXml-devel
 
@@ -198,8 +209,8 @@ 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
@@ -208,15 +219,15 @@ Package contains utilites for PDF files. These utilities allow to
 - 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ą
+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
-%patch0 -p1
 
 %build
 %{?with_apidocs:%{__gtkdocize}}
@@ -226,7 +237,7 @@ 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} \
 	%{!?with_cairo:--disable-cairo-output} \
 	%{!?with_qt:--disable-poppler-qt} \
@@ -235,7 +246,9 @@ Pakiet zawiera zestaw narzędzi do plików PDF. Programy te umożliwiają
 	%{?with_apidocs:--enable-gtk-doc} \
 	--enable-xpdf-headers \
 	--enable-zlib \
+	--enable-dependency-tracking \
 	--with-html-dir=%{_gtkdocdir}
+
 %{__make}
 
 %install
@@ -244,6 +257,11 @@ 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
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -263,7 +281,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.4
 
 %files devel
 %defattr(644,root,root,755)
@@ -272,7 +290,6 @@ 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/splash
 %exclude %{_includedir}/poppler/glib
@@ -280,16 +297,20 @@ rm -rf $RPM_BUILD_ROOT
 %{?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
+
 %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.4
 
 %files glib-devel
 %defattr(644,root,root,755)